This should prevent any further "substructure has residue [...] which is not in self.target" errors. Add test and doc to clarify what we ignore.