Revert "Tidy up enum sets"

This reverts commit c73681faee336af720652da163b542a2fd93e339.