Use -Q consistently