Improve relational

fixes #8206 (please feel free to any others that are related that also work with these changes)
fixes #6463 - I just let polys do as it likes but make sure that the properties requested are right

It is better if you explicitly write `i == 1` or `not i == 0`.