Improve some numeric syntax lexing