Use CAST AS VARCHAR to make existing tests more evident.
Switch to using POINT(lat,lon) consistently.