Be more picky about trapezoid shapes. Improves #28 slightly