Oh, and add that missing 'to_s' that I accidentally chopped out while cherry-picking.