A tangled legacy handler gets pulled apart one bounded step at a time, behind the safety net the earlier testing series already built.
