Minor refactoring.
Adding handling of notification version updates.