Removed couple more uses of debug stuff.