(NotificationsEmails) Promoting notification properties to top-level, plus other review fixes