Fix serializing/deserializing null origins.