It looks to me like a number of things about the maintenance of the signatures and signatureMap are possibly wrong now (some of which might already have been wrong before this change), but I don't understand it well enough. I'll add a task to review how it's used and fix any outstanding issues.