Add comment/doc prefixes, un-"protect" some bits.
Improve doc comment alignment.
Tidy up doc prefix auto-insertion on newline.