Clean up API docs.

And get rid of a few more unnecessary classes.