2x faster compile of value_types.hpp - start working on #2346