Make man pages match respective 'COMMAND --help's. Also, some pep8 cleanups.