Improve handling of trailing block comments

This is a follow up to r174309 to actually make it work.