8c0f93bb9b
Also clean up debugging output in a slightly more uniform fashion. The default behavior remains the same (all debugging output is turned on)