Improved type-safety for class Comment