More internal refactoring of Notification constants.