#587706 follow-up by plach: trim GET['q'] centrally in request_path() so subsequent places don't have to do it.