cleanup problems in Variant.h (duplicate definition of varCigar)