Add better number matching for octal numbers as well
Improve parsing of escaped decimals dramatically