Comments/code cleanups to ObjectVariantMapper