scrub.py: moved from optparse to argparse, minor changes