more cleanups to templates in VariantValue  implementation