Optimized the parser a bit more