Small cleanup to try and work out subtleties of shared queries and projects.