Replaced internal uses of bind(one_shot(...)) by deferred_call. Fixes #1042