Some cleanup around coordinates.