Fix block comments

Two changes that together provide a solution for the problem in #1117.