Make sure that an index that covers a proper superset of the WHERE clause
terms of some other index has a lower cost than the other index.
Also make sure an index that is a proper subset of some other index has a
higher cost than that other index.  Add test cases.
Remove an unnecessary conditional.