Additional tweaks to deprecation logging