d90bb81 Split single Listener into Token/Resource.