Fixes #48. Added some AST-building improvements for faster execution