@isaacs i feel like this is the most drastic change. all tests pass, but just want a sanity check this is clean.