Fix warnings and checkstyle errors introduced post-Matt C's changes.