Simplify code & fix recursive task-bindings.