diff --git a/PPI/SocketSource.hh b/PPI/SocketSource.hh
index 49c863ff45e7c902b0ab3dfb7ef78908243fee3d..44368fb528914cc0d648a9bd2d606a80226dd887 100644
--- a/PPI/SocketSource.hh
+++ b/PPI/SocketSource.hh
@@ -91,11 +91,12 @@ namespace module {
         {
         public:
             typedef unspecified_type Handle;                       // type of handle requested
+            typedef unspecified_type PacketType                    // type of packet returned
 
             SomeReader();                                          // EITHER default constructible
             SomeReader(SomeReader const & other);                  // OR copy constructible
 
-            Packet operator()(Handle handle);                      // extraction function
+            PacketType operator()(Handle handle);                  // extraction function
         };
         \endcode
         Whenever the FileHandle object is ready for reading, the \a Reader's \c operator() is called
diff --git a/Utils/Logger/AreaRegistry.cc b/Utils/Logger/AreaRegistry.cc
index 5dc0d9d1e3a4f0329ca04f84446376489a59ed2b..7a6a98856be59b9403a95e3948d3e270095dc1a9 100644
--- a/Utils/Logger/AreaRegistry.cc
+++ b/Utils/Logger/AreaRegistry.cc
@@ -89,7 +89,7 @@ prefix_ void senf::log::detail::AreaBase::removeRoutingCache(Target & target,
 
 prefix_ void senf::log::detail::AreaBase::write(time_type timestamp,
                                                 StreamBase const & stream, unsigned level,
-                                                std::string msg)
+                                                std::string const & msg)
     const
 {
     if (stream.index >= routingCache_.size())
diff --git a/Utils/Logger/AreaRegistry.ih b/Utils/Logger/AreaRegistry.ih
index 58709bf450eaa0b62c1044b56cf3d946b296aa2e..53b3d1009e08de77f44d0f555f01e39f446207ba 100644
--- a/Utils/Logger/AreaRegistry.ih
+++ b/Utils/Logger/AreaRegistry.ih
@@ -58,7 +58,7 @@ namespace detail {
         void updateRoutingCache(Target & target, StreamBase const & stream, unsigned limit) const; 
         void removeRoutingCache(Target & target, StreamBase const & stream) const; 
         void write(time_type timestamp, StreamBase const & stream, unsigned level,
-              std::string msg) const;
+                   std::string const & msg) const;
 
     private:
         struct RouteEntry {
diff --git a/Utils/Logger/Target.cc b/Utils/Logger/Target.cc
index eafaabfe79b5010a0c4371170e84896eff793208..d63201f07c19014d6222b09d9ff4e7670fcefdb7 100644
--- a/Utils/Logger/Target.cc
+++ b/Utils/Logger/Target.cc
@@ -206,7 +206,7 @@ prefix_ void senf::log::Target::write(time_type timestamp,
 
 prefix_ void senf::log::detail::TargetRegistry::write(StreamBase const & stream,
                                                       AreaBase const & area, unsigned level,
-                                                      std::string msg)
+                                                      std::string const & msg)
 {
     if (fallbackRouting_) {
         if (level >= stream.defaultRuntimeLimit())
diff --git a/Utils/Logger/Target.cti b/Utils/Logger/Target.cti
index bad63ab45695f1f5daaa7617b85811f616148e04..5d906ee52d84967b606d0489e13f95aa7c6ec471 100644
--- a/Utils/Logger/Target.cti
+++ b/Utils/Logger/Target.cti
@@ -88,7 +88,7 @@ prefix_ void senf::log::Target::unroute(action_t action)
 // namespace senf::log::detail members
 
 template <class Stream, class Area, class Level>
-prefix_ void senf::log::detail::write(std::string msg)
+prefix_ void senf::log::detail::write(std::string const & msg)
 {
     TargetRegistry::instance().write(Stream::instance(), Area::instance(), Level::value, msg);
 }
diff --git a/Utils/Logger/Target.ih b/Utils/Logger/Target.ih
index c96eb328837924b6233faf24b7150c3a8b92db7f..a0838719b46757d5f7f93247aa1e9af738c34bc7 100644
--- a/Utils/Logger/Target.ih
+++ b/Utils/Logger/Target.ih
@@ -45,7 +45,7 @@ namespace detail {
         using senf::singleton<TargetRegistry>::instance;
 
         void write(StreamBase const & stream, AreaBase const & area, unsigned level, 
-                   std::string msg);
+                   std::string const & msg);
 
         void routed();
         bool fallbackRouting();
@@ -67,7 +67,7 @@ namespace detail {
 
     /** \brief Internal: Write log message */
     template <class Stream, class Area, class Level>
-    void write(std::string msg);
+    void write(std::string const & msg);
 
 #ifndef DOXYGEN
 
diff --git a/Utils/Range.cti b/Utils/Range.cti
index 0444e4251ebd19085204736323a4bd14b2959ab2..38744c353a61a9604d1999005d3402f286ded796 100644
--- a/Utils/Range.cti
+++ b/Utils/Range.cti
@@ -41,6 +41,17 @@ senf::make_transform_range(Range const & range, Fn const & fn)
         boost::make_transform_iterator(boost::end(range), fn) );
 }
 
+template <class Range, class Fn>
+prefix_ boost::iterator_range< 
+        boost::transform_iterator< Fn,
+                                   typename boost::range_iterator<Range>::type > >
+senf::make_transform_range(Range & range, Fn const & fn)
+{
+    return boost::make_iterator_range(
+        boost::make_transform_iterator(boost::begin(range), fn),
+        boost::make_transform_iterator(boost::end(range), fn) );
+}
+
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_
 
diff --git a/Utils/Range.hh b/Utils/Range.hh
index f9da32262aa03ea5b5a926009a60df821b478485..6f9ef840e191704f468f848cf54fac067f434f15 100644
--- a/Utils/Range.hh
+++ b/Utils/Range.hh
@@ -46,6 +46,12 @@ namespace senf {
                                    typename boost::range_const_iterator<Range>::type > >
     make_transform_range(Range const & range, Fn const & fn);
 
+    template <class Range, class Fn>
+    boost::iterator_range< 
+        boost::transform_iterator< Fn,
+                                   typename boost::range_iterator<Range>::type > >
+    make_transform_range(Range & range, Fn const & fn);
+
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
diff --git a/project.el b/project.el
index 703309fc0fc779b1e4b5ad845a05db22164269d0..f34d538962f7ecdcaa876eb5307113b21db0fbcd 100644
--- a/project.el
+++ b/project.el
@@ -3,7 +3,9 @@
 (defun check-namespace-indent (arg)
   (save-excursion
     (back-to-indentation)
-    (if (looking-at "namespace") [0] '+)))
+    (if (and (looking-at "namespace")
+	     (not (looking-at ".*}")))
+	[0] '+)))
 
  (defconst senf-c-style
   '((c-basic-offset              . 4)