Semantics change on PartialNumericalMatch

Plus a bit of optimisation.