Win the quiet race

Spot legacy pain and pick the first fix.