Optimized the identifier statement parser a bit