Tweaked pretty printing in several cases.