This is a meta issue to track all other issues that are about getting dirty hacks out of NodeStream. There are a few of them, and I will try and highlight them soon in order to try and rip them out.