Parser and position improvements.