Improve comment parser.