Replace overly-aggressive comparison for type equality with an isinstance check.