Reduce complexity; Fix corners for real.