Port KC's grammar fix to tree grammar (#49)
Swapped KC's assign_stat alts, passes testcases again (closes #49)