Minor cleanup of debug diagnostics