Fix for on() and off() function overloads causing generic calls not to work implicitly.