Misc tidy-up stuff
Defaults support for enums