Cleaner notification service instantiation, and ensure defaults get applied by using 'add' when notifications come over the wire.
Cleaner notification service instantiation, and ensure defaults get applied by using 'add' when notifications come over the wire.

cha0s/shrub,cha0s/shrub,cha0s/shrub