Make exit-code test use same mechanism as existing one.