regarding your edit, it was hardly a perfect solution. he just bit his lip real hard. that was his message to himself. i think it's mentioned a few paragraphs before he tells mcgonnagall about it. it is in there, but it is easy to miss on the first read through, to be sure.