Does not fix #32, 32 points out numerous issues that aren't restricted to the headers' consistency

thats why i said mostly

It makes the headers look like this:

I think CCSMB-1 should be modified in the manner outlined here.

Try adding two spaces to the end of each line? That should preserve the line breaks without necessarily making each section of the header its own paragraph. (And then, obviously, edit CCSMB-1 to tell people to add the two spaces after each line.)