diff --git a/python/pacemaker/_cts/cmcorosync.py b/python/pacemaker/_cts/cmcorosync.py
index 11b31a5d83..109045b44c 100644
--- a/python/pacemaker/_cts/cmcorosync.py
+++ b/python/pacemaker/_cts/cmcorosync.py
@@ -1,60 +1,61 @@
 """ Corosync-specific class for Pacemaker's Cluster Test Suite (CTS)
 """
 
 __all__ = ["Corosync2"]
 __copyright__ = "Copyright 2007-2023 the Pacemaker project contributors"
 __license__ = "GNU General Public License version 2 or later (GPLv2+) WITHOUT ANY WARRANTY"
 
 from pacemaker._cts.CTS import Process
 from pacemaker._cts.clustermanager import ClusterManager
 from pacemaker._cts.patterns import PatternSelector
 
 class Corosync2(ClusterManager):
     '''
     Corosync version 2 cluster manager class
     '''
     def __init__(self):
         ClusterManager.__init__(self)
 
         self._fullcomplist = {}
         self.templates = PatternSelector(self.name)
 
     @property
     def components(self):
         complist = []
+
         if not self._fullcomplist:
+            common_ignore = self.templates.get_component("common-ignore")
+
             for c in [ "pacemaker-based", "pacemaker-controld", "pacemaker-attrd", "pacemaker-execd", "pacemaker-fenced" ]:
-                self._fullcomplist[c] = Process(
-                    self, c, 
-                    pats = self.templates.get_component(c),
-                    badnews_ignore = self.templates.get_component("%s-ignore" % c) +
-                                     self.templates.get_component("common-ignore"))
+                badnews = self.templates.get_component("%s-ignore" % c) + common_ignore
+                proc = Process(self, c, pats=self.templates.get_component(c),
+                               badnews_ignore=badnews)
+                self._fullcomplist[c] = proc
 
             # the scheduler uses dc_pats instead of pats
-            self._fullcomplist["pacemaker-schedulerd"] = Process(
-                self, "pacemaker-schedulerd", 
-                dc_pats = self.templates.get_component("pacemaker-schedulerd"),
-                badnews_ignore = self.templates.get_component("pacemaker-schedulerd-ignore") +
-                                 self.templates.get_component("common-ignore"))
+            badnews = self.templates.get_component("pacemaker-schedulerd-ignore") + common_ignore
+            proc = Process(self, "pacemaker-schedulerd",
+                           dc_pats=self.templates.get_component("pacemaker-schedulerd"),
+                           badnews_ignore=badnews)
+            self._fullcomplist["pacemaker-schedulerd"] = proc
 
             # add (or replace) extra components
-            self._fullcomplist["corosync"] = Process(
-                self, "corosync", 
-                pats = self.templates.get_component("corosync"),
-                badnews_ignore = self.templates.get_component("corosync-ignore") +
-                                 self.templates.get_component("common-ignore")
-            )
+            badnews = self.templates.get_component("corosync-ignore") + common_ignore
+            proc = Process(self, "corosync", pats=self.templates.get_component("corosync"),
+                           badnews_ignore=badnews)
+            self._fullcomplist["corosync"] = proc
 
         # Processes running under valgrind can't be shot with "killall -9 processname",
         # so don't include them in the returned list
         vgrind = self.env["valgrind-procs"].split()
         for (key, val) in self._fullcomplist.items():
-            if self.env["valgrind-tests"]:
-                if key in vgrind:
-                    self.log("Filtering %s from the component list as it is being profiled by valgrind" % key)
-                    continue
+            if self.env["valgrind-tests"] and key in vgrind:
+                self.log("Filtering %s from the component list as it is being profiled by valgrind" % key)
+                continue
+
             if key == "pacemaker-fenced" and not self.env["DoFencing"]:
                 continue
+
             complist.append(val)
 
         return complist