Optimised the tokenTest method for PartialNumericalMatch

Using ugly methods, including assignment inside a boolean expression...