Mostly cosmetic changes from review of last PR. Also same inappropriate use...

Mostly cosmetic changes from review of last PR.  Also same inappropriate use of _info changes to configurable debug macros.  Remember folks, if it has a _ or __ in front, it is not intended for use outside of the header file.  It is an internal private definition.