Add Attachment:DRY-45: Amb: Distinguish type variables from class names after disamb