More pretty-printer improvements