Update rx for #61

This is a cursory upgrade and could be taken further. The tests all
pass, but I want to make sure this really works before cleaning up
further.

@mbossenbroek 
I did this weird dance before because it would block sometimes when fetching the final result. This was the only incantation that made it return data.