Simplification of the parser. Should be a bit more accurate.