Improve comments, triggered by Trac #15135