Simplify ST_GeometryType

@mlecoeuvre Please see these corrections.