Minor rearrangement of test_exhaustive.cpp.