Change return value in pointFor() from Point2D to PointBounds.
Rename PointBounds to PointQuery.