Restored a check that a recent cleanup had quietly disabled

An earlier improvement to the ordering safeguard removed the only test able to detect one of its rules, without anything failing. The rule is verified again, using a query shape the cleanup cannot affect.