diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg
index 32ff48772..4b8fbc52d 100644
--- a/Lib/python/pycontainer.swg
+++ b/Lib/python/pycontainer.swg
@@ -574,10 +574,7 @@ namespace swig
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
 
-    %pythoncode {
-      def __iter__(self):
-        return self.iterator()
-    }
+    %pythoncode {def __iter__(self): return self.iterator()}
   }
 #endif //SWIG_EXPORT_ITERATOR_METHODS
 %enddef
diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg
index 8d2a4f3a1..77234b693 100644
--- a/Lib/python/pyiterators.swg
+++ b/Lib/python/pyiterators.swg
@@ -316,10 +316,7 @@ namespace swig
 
   %nodirector PySwigIterator;
   %extend PySwigIterator {
-  %pythoncode {
-    def __iter__(self):
-      return self
-  }
+  %pythoncode {def __iter__(self): return self}
   }
 
   %catches(swig::stop_iteration) PySwigIterator::value() const;
diff --git a/Lib/python/std_map.i b/Lib/python/std_map.i
index 9e6799fa9..9e5f50512 100644
--- a/Lib/python/std_map.i
+++ b/Lib/python/std_map.i
@@ -231,19 +231,10 @@
       return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
 
-    %pythoncode {
-      def __iter__(self):
-        return self.key_iterator()
-
-      def iterkeys(self):
-        return self.key_iterator()
-
-      def itervalues(self):
-        return self.value_iterator()
-
-      def iteritems(self):
-        return self.iterator()
-    }    
+    %pythoncode {def __iter__(self): return self.key_iterator()}    
+    %pythoncode {def iterkeys(self): return self.key_iterator()}
+    %pythoncode {def itervalues(self): return self.value_iterator()}
+    %pythoncode {def iteritems(self): return self.iterator()}
   }
 %enddef
 
diff --git a/Lib/python/std_pair.i b/Lib/python/std_pair.i
index 5b563bbca..673e85eef 100644
--- a/Lib/python/std_pair.i
+++ b/Lib/python/std_pair.i
@@ -120,10 +120,9 @@
 
 %define %swig_pair_methods(pair...)
 %extend {      
-%pythoncode {
-def __len__(self):
-  return 2
-def __getitem__(self, index):
+%pythoncode {def __len__(self): return 2
+def __repr__(self): return str((self.first, self.second))
+def __getitem__(self, index): 
   if not (index % 2): 
     return self.first
   else:
@@ -132,13 +131,9 @@ def __setitem__(self, index, val):
   if not (index % 2): 
     self.first = val
   else:
-    self.second = val
-def __repr__(self):
-  return str((self.first, self.second))
-}
+    self.second = val}
 }
 %enddef
 
-
 %include <std/std_pair.i>