Fix some 80 cols violations committed in r207539

Caught by Eric Christopher in post-commit review.