Fixes #1630.  When callbacks were deleted, the cid map was not correctly updated.
Merge pull request #1630 from mdboom/reconnect_callbacks

A disconnected callback cannot be reconnected