Improved number token parsing