Better orthogonalization of skinny quads. Fixes #1812