r20442: Slight rewrite of the change notify infrastructure. This now survives the