This might be solving bugs that haven't happened yet!  Let's get something landed.  What's in the pull req now is as good as anything.  If we see problems that can't be solved another way, we can consider some of these more complex fixes.