Add some alternate forms in enums

Should fix issue #920