Remove semantics from parser; add more statements