Adjust in response to various bits of brucification:

Adjust in response to various bits of brucification:

1) Fix style issues in comments.
2) Properly namespaceify changes
3) Appropriate sectioning of changes

Not changed: parenthesis around macro rvalue.  That would make the additions
inconsistent with the other entries there, merely a different style violation
rather than a clear and obvious improvement so I'm going to have to disagree
with the judges on that one.  If someone wishes to adjust *all* the rvalues
to conform to fully parenthesized marco rule, that would be both consistent
and reasonable but that's beyond the scope of the changes I wish to make at
this time.