Protect against bad spline patch data better.

Also fix a struct name collision.