Compare .Kind() instead of direct equality checks on a dyn.Value

Compare .Kind() instead of direct equality checks on a dyn.Value #5800