Fixed code review change to ensure that VALUES constants are of the same result type as the field they are constants for