prettyprint: a bit more cleanup.