Improved number matching to match across whitespace.