Replace brittle subscription token heuristic with explicit args

Replace brittle subscription token heuristic with explicit args #4