...but not yet switched into the main LocationQuery interface, because that would also break the existing implementation; recasting this implementation is the next step to do....