Octal integers + TokenFinder refactoring