Replaced array types with enumerations.