Global namespace refactoring ok.
Todo: change 'tokens' to 'atoms'.
Some more constant cleanup of sentences.