Winding order fixes.

Work-in-progress for #1802.