Squashed -Wextra warnings.

There were some minor bugs caught by a sweep with -Wextra.