Make a few changes to stay under 80 char wide.

It seemed like there was effort to have code width be limited, so I just
did a tiny bit of reformatting.