Wrap comments by word rather than by character

@isaacseymour Review?
Can't these two happen in the one `flat_map`?