Cleanup after pull request #72.

These are a bunch of minor little cleanup things that we found after the codeskulptor pull request #72.  Many of them are little pieces we missed when we merged from upstream.