Formatting cleanup, follow-up to #378.