Clean up Non-Linear Geometries extension and R31

[jyutzler]

As written, part of R31 (the uppercase geometry type name from Annex G) is redundant with R25. That phrase can be safely removed which makes the tests a little cleaner.