Changes to TYPE_, OPSZ_ enums and resulting code changes