Further corrections to shift/reduce conflict reporting.