Intermediate commit, cleaning up some code prior to real algorithmic
work.