Repair needed following merge of pmatch branch.