generate pure predicates for things like <,>,<=,...

rather than spatial ones. Also, some cleanup.