Switch to alternative ParseError building algorithm, other tweaks