Beginning support for non-basic variant types.