Minor cleanup in debug code.