Fixed regression added in previous refactoring
Merge pull request #297 from stloyd/bugfix/token_usage_regression

Fixed regression added in previous refactoring