Smarter initial comment expanding
Merge pull request #168 from guardian/comment-optim

Smarter initial comment expanding