Rework the pretty printing, again.