This is exactly what we discussed on IRC...

probably manual registration of add / remove is best approach as you suggest.