Re-write the number lexing code