Improved handling of spelt-out numbers