DisplatchTokenMaker refactoring