Now defining variants work correctly.  Previously woundn't overwrite
key definitions when based on a different variant.  This was due to
duplicate key definitions.