Since people need to change this anyway, can we finally drop that &? It's only needed if people are directly assigning to $query, which they shouldn't be doing.