Move the sink formation tasks to the sub-structure of the cell to save memory in the cases where sinks are not used at all.