Improve names of comment token helpers.

block_comment/line_comment is better than long_comment/short_comment,
you don't really know which one is long/short :)