(- client fix) Prepare groundwork for Client-compatible debugging output

There's no meat here; just splitting things out so the client doesn't spit a nut at undefined crap.