Re #6630. Changed from argparse to optparse for Owen.