Merging Enums

More tidy up.