Fixes #3132 - Improve rendering of block-comments