Trivial cleanups and refactoring

These are a bunch of trivial changes that each accomplish at least one
of the following:
  - Fix compiler warnings (const char -> char)
  - Remove dead code
  - Improve formatting
  - Reduce the diff to the original upstream source.