Wip calateuth wusui

Could you move these helpers down to just below the task functions that use them? I think the module will be more readable that way.