Tweaks for returning comments

Make sure that
  HeaderInfo works as expected
  getRichTokenStream works as expected
  header pragma comments are fully returned as annotations