Add Attachment:DRY-112: Amb: implement disambiguation of uses of member classes