Removing some watchdog notices from deprecated passing by value