Fix an argparse error I only just noticed.

Short and long options are separate arguments.
Merge branch 'master' into calref