Datatype refactoring: no enums