Do a little bit more work on a table-driven basis.  A little cleanup.

Seems to work at the moment.
2 files changed