simplify typical flow and make it symmetrical; for some reason callcounts have gone up
and esp. samethread-connect seems to be failing as it's gone way up