Better genericified parser stages.