More reach logic fixes. Still doesn't always do the right thing when a response comes in, but I think it now avoids doing the wrong thing.