= Fix parse error formatting potentially creating duplicate "expected" values
= Add various smaller improvements