Accomodate AbstractRegistry changes.