Improved check to decide if to add chain/residue.