Top level enums, fixes #7