Bitswap Rounds CR suggestions #2

@whyrusleeping another round of suggestions. Let's keep this one open for the while.