Update to new Restraint interface.