More magic to tighten up a little of the formatting.