Clean up static data structs. and remove unuseds.

In this commit, we remove some static data structures and some of the
not-so-clean things about them by consolidating the behavior into the
core enum itself to reduce maintenance across sites.

A couple of peculiarities are noted for next-round cleanup.