more pretty-printer tweaks