Move more uses of interfaces.register...