Fixed such that we fail if using integer constants for character set fields, now need to have correct constant types