Fix (and add tests for) two more ordering holes found by autobid-for-none