We might as well do all of these at the end.  Fix up a couple minor
style nits while we're there.
Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>