Cleanup debug code, again.