Fix bugs with limiting the number of variant qualifiers.