comment: Make comment directives no longer use the internal "_comment" form, and...