Other work on the parser