#9655: geometry validation more conservative