I'm not sure this is an improvement. It still feels fragile, but it passes all tests.