small cleanups - mostly to const - for ObjectVariantMapper