While here, also change the diagnostic emission to pass the interface type rather than the interface name. This prepares us to include the arguments in the diagnostic.
InterfaceType
FacetType