Collapse classes.

There was no need to have separate classes.  Had some inappropriate
intimacy. Now I can simplify the code even more.