Adapted to changes in parser framework.