Modifying the implementation of type numbering and encoding so that, instead of the type aliases type_nr_t and token_t, the strongly typed TypeNumber and Token enumeration classes are used to provide a type-safe way of working with type numbers and tokens.