no reason to make these defaulted, we always pass values in
extract callback param munging
call extracted method from callback manipulation methods
extract getting an setting callbacks to methods
adding more callback type coverage
Update mail to minimum version 2.5.4