Refactoring and improvements to the comments option parser.