Fixup for enums - better to use IOR and IOW macros