Not every notification was being extended properly.

Standardise variables.
Simplify code.
Allow simultaneous --save and --save-dev flag.