We should decide on a final version for this debugging stuff.  We can make lots of changes in our own branches but what goes into the main branch should be the "right" way of doing it.