Minor deserialize_lazy cleanup