Make single point work with refactor of spatial data code.