[cvs-nhc98] Formatting, comments, + extra command-line option.