The main point is supposed to be within the object, but
to check against that first it had to be detected as such.

The semi-automatic adding of main points some years ago
left some room for improvement.

Also fix some shape definitions regarding their line vs.
polygon/beziergon use.