Yeah, I added a bunch of asserts just to make sure I didn't break anything. I've been running this as my own client and it seems to work well (no assertion failures, peers respond the same way they always do, etc). I can remove all the asserts now if you want.