Yeah, definitely still feels fragile, but it seems like a bit of an improvement, and at least it handles the cases we know about.