Remove more magic numbers and remove enumerator names.