Refactoring tasks to follow env.[session|machinery|scow] refactor.