Rename type_for_value to type_and_value.