Avoid Coordinate and Point typedefs