Auto merge of #42897 - Mark-Simulacrum:pretty-print-refactor, r=jseyfried

Refactor pretty printing slightly

This doesn't introduce any functional changes (that I'm aware of). The primary intention here is to clean up the code a little. Each commit is intended to stand alone, reviewing commit-by-commit may be easiest.

Author: bors