Changed wrapping to use new standard library replacement functional
interfaces.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>
Whitespace change.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>
Fix to align andThen method of Consumer-like functions with standard
library.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>
Cleanup pass to remove extra indirection and fix a bug this revealed.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>