Catch up to new COMMENT semantics (contains comment string instead of
pointing to pkg-comment)

Submitted by: lioux