Code cleanup. Enhancements to CNotifier classes.