Using getopt now.
Cleaned up a mite.