Heavy token refactoring.