Fixed bug in listener-of-cpair macro, which isn't currently in use anyway.