Minor cleanup, mostly around debugging.