Change parse function signature (again).
Improve pretty-printer.