Improve structure of valid_value_types
(#350)