Okay, now uses setup_harness(), which after some discussion appears to be the right fit.