Note: this doesn't include command and key, which is still behind the IncludeDetailInExceptions flag

I HATE this, but it's now just plain broken, and no one's going to fix it (or accept a fix for it).

Some socket fixes are in here...let's make sure we're getting them.

We're getting an extra in prod...need to figure out what it is. I'm betting a heartbeat in there.