Rework the salamander straightening.

Copy and paste the new straighten function.