That's what I had before. But it got a bit ugly doing another check for geometry type (POINT vs. MULTIPOINT) and do two different things. Any other suggestion?