Fix flake8-bugbear B045

cylc/flow/data_store_mgr.py

@@ -789,12 +789,9 @@ def generate_definition_elements(self):
 
         # Created family definition elements for first parent
         # ancestors of graphed tasks.
-        for key, names in ancestors.items():
-            for name in names:
-                if (
-                        key == name or
-                        name in families
-                ):
+        for names in ancestors.values():
+            for name in names[1:]:
+                if name in families:
                     continue
                 f_id = self.definition_id(name)
                 f_stamp = f'{f_id}@{update_time}'

cylc/flow/id_cli.py

@@ -509,16 +509,15 @@ async def _expand_workflow_tokens(tokens_list, match_active=True):
         if not contains_fnmatch(workflow):
             # no expansion to perform
             continue
-        else:
-            # remove the original entry
-            multi_mode = True
-            tokens_list.remove(tokens)
-            async for tokens in _expand_workflow_tokens_impl(
-                tokens,
-                match_active=match_active,
-            ):
-                # add the expanded tokens back onto the list
-                tokens_list.append(tokens)
+        # remove the original entry
+        multi_mode = True
+        tokens_list.remove(tokens)
+        async for expanded_tokens in _expand_workflow_tokens_impl(
+            tokens,
+            match_active=match_active,
+        ):
+            # add the expanded tokens back onto the list
+            tokens_list.append(expanded_tokens)
     return multi_mode