Improvements suggested by Matt's improved manpage.