Cleaned up over-usage of strongly typed enums.