The -g and -G options now take "-" to mean stdin, and I think I abused the
language in the process.
Made a section of code slightly more compact and abusive of the language