Fix Scalar.WHICH for type values