Hardening against nulls for deserialization.

When one attempts to populate data structures via deserialization,
nulls tend to show up in unlikely or "impossible" places. Now
there are a few fewer.