Comment 4 for bug 1100620

Thought about the problem for a bit, and here's a different patch which fixes all the issues very simply. Please ignore the previous patches.

It does add one more point per circular segment, so I've also compensated by reducing the subdivisions to 36 (from 40). So as to not adversely affect performance.