Some more simplification and renaming the awkward Coord to Point.