Made serialize_for_version and deserialize_for_version use ONLY_VERSION.
Made recent changes compile on gcc-4.4.