Add some debug code, clean up some debug code

Authored by tfry on Jan 1 2020, 9:24 AM.