remove Context dependency from TokenSortCollector
move tokenSorts from Context to Definition