Renaming continued
Get rid of most block comments

They're rather difficult to maintain.