diff --git a/oslo/messaging/target.py b/oslo/messaging/target.py
index 504ac932d..c4c7f81d4 100644
--- a/oslo/messaging/target.py
+++ b/oslo/messaging/target.py
@@ -69,12 +69,9 @@ class Target(object):
         self.fanout = fanout
 
     def __call__(self, **kwargs):
-        kwargs.setdefault('exchange', self.exchange)
-        kwargs.setdefault('topic', self.topic)
-        kwargs.setdefault('namespace', self.namespace)
-        kwargs.setdefault('version', self.version)
-        kwargs.setdefault('server', self.server)
-        kwargs.setdefault('fanout', self.fanout)
+        for a in ('exchange', 'topic', 'namespace',
+                  'version', 'server', 'fanout'):
+            kwargs.setdefault(a, getattr(self, a))
         return Target(**kwargs)
 
     def __eq__(self, other):