Remove the debris from the old test-running loop

A happy result: the new loop is not only better factored, but also
noticeably simpler than the code it replaced.