Enhanced the parser a bit and switched to better PrettyPrinter.