Organize, Alphabetize, and Reduce headers
Cleanup mode definition and misc.
Merge pull request #173 from batrick/debug-simplify

Simplify/clean up some code in debug.[hc].