Check command line parameter count instead of option count, and do it after evaluating option arguments Fixes b6241cb1 .
