Make test_manual_matchcalltab work again.#