Upgrade Jenkov's parser to support numbers