Refactored pretty-printer to expose subsiduary pp functions.