Cleanup.
Fixed problems with serialization/deserialization of Enumerables.