[PATCH 0 of 6] cleanup: formatting and except clause improvements

[Brodie Rao]

This series resolves some of the warnings raised by check-code.py -w (in
addition to other minor cleanup).