Typo fixes
Add helpers for getting and setting deep couriers
Deep access to courier, minor cleanup
Minor cleanup
Minor cleanup, enable deep object with addCourier
Check for deep courier
Add helpers to dry up some functions
Simplify functions and introduce deep couriers
Add more helpers
Simplify notification extending
Dry up code with helpers, improve some formatting
Cut down
Cleanup and cut down
Use helper function
Minor fixes
Merge devel