main: removed short option handling from command line parsing functions.