Yeah, and I think you're right about getting rid of signatureMap. I had hoped there'd be some use for it in identifying text nodes, but what we ultimately want is a way to identify the presence of a text node in a certain spot which doesn't really match up with hunting it down by contents.