Rudimentary streaming.
Fixed test breakage.
Misc cleanups.