Minor improvements.

The next set of errors will require some refactoring.