I changed the arguments of some functions to be sites instead of points. This way some same_points queries can take advantage of the site information.