Fixed rewrite rule and factored out tree grammar rule in expr (#37)
Added func_call alt to expr expansion, passes ALL good test cases (closes #37)