coding style: fix style issues from merge of PR #257

PR #257 was aggressively merged before all coding-style issues had
been commented on.  This addresses the issues that came up (except the
drive-by whitespace cleanup that was contained in PR #257 and would
require a force-push) in review.