[#2270] Tweaks to new serializer features in 2.3