More variable unsetting during CommentData building