Further fixes to schema resolution; trying to sort out nested message serialization