Minor debug output format improvements