Don't clobber uri.query when it's present.