Simplify Gof2 a little.
More simplifications of the gaptree fit and rotation functions.