Fix up types on MasterDefRegistry

@rev byao@
Merging origin/goliver/master-pending-mdr-fixup into master