Replace scaling from overlap=scale, and make it a general option
before overlap removal. Thus, we remove the special-purpose code
from twopi. In time, this might take on the semantics of overlap_scaling.