Port changes from menhir/faster-reachability branch

This merge request import all changes that were applied to the version of Fix vendored in menhir "faster-reachability" branch.