Move DOC_COMMENT tokens to the comments channel

* Fixes #465
* Fixes #633