Make combination of -n and -q options work

We can't even begin to consider #169 and #170 without this :-).