Just refactorings as I get my head around the code.

[rbtcollins]

Let me know what you think.

I wish there were a clearer separation in unfold between the option closure and the future closure, but I can't seem to find a working permutation of types to use a real local function, so agh but whatever.