Fixed some things I broke last week in introducing diagonal scaling to GMG.