BTW, I opened #920 as a suggestion that we might make this registration/deregistration all-around simpler and safer.