Add non-bare variants.