Merge "Optimize ValueType class lookups"