Remove generics from Reference in TaxEditor #5830