Start refactoring to parse tokens instead of strings.