@etrepum: Is this what you had in mind? Should I do the same thing for `comment`?