Unbreak highlighting in python-mode
Make subscriptions with the same ID but different connections share a queue

See bug 26276 for the background.