Started implementing mandatory maximal catching.