Correct grammar and interface for parser