Revert "Simplified parsing, but there is still an extra ' ) ' at the end when printing parse tree."

This reverts commit a047cfa1cfa2df2f733b52d9f8e8e70ca767c033.