Object Versioning: some clean-up after the recent changes