Make Folding signatures more consistent with those of Scan