Cleaning of several regressions in the parsing code.