ContactMechPurposeType bad design

[Adam Heath]

There is currently a PRIMARY_EMAIL, PRIMARY_LOCATION, BILLING_EMAIL,
BILLING_LOCATION, etc.  Why can't that just be PRIMARY, BILLING, etc?