Use a simpler method for testing for geometry type