Issue #16933 (merge from 3.2): Improve choices examples in argparse docs.