more serialization implementation

I don't see how that is an odd place, it is the first place where that direct information is available.

Changed to use count().