Attempt to fix handling of quadratic splines with no on-curve points.

This addresses issue #1517.

I moved these declarations nearer to where they are used.