Take advantage of the register enums being in order to remove a couple static tables.