CommentSema: Factor code better. No functionality change.