Updated treatment of constants, enums, bitmasks