Fix up merging of notifications to match up to what clients currently expect.

More work needed on merging of actual changes