Remove unused options -a and -C.
Collapse the -w into -O, for symmetry with -J.
Update the man page to the latest options.