Fix regexp matching in s-numeric?,s-*case?