Merge "Fixing refcounting debug statements that've gotten bitrotten."