diff --git a/include/indentlog/print/tag.hpp b/include/indentlog/print/tag.hpp
index 6c7eafbb..7d4a0abc 100644
--- a/include/indentlog/print/tag.hpp
+++ b/include/indentlog/print/tag.hpp
@@ -29,7 +29,7 @@ namespace xo {
         tag_impl(Name const & n, Value const & v)
             : name_{n}, value_{v} {}
         tag_impl(Name && n, Value && v)
-            : name_{std::move(n)}, value_{std::move(v)} {}
+            : name_{std::forward<Name>(n)}, value_{std::forward<Value>(v)} {}
 
         Name const & name() const { return name_; }
         Value const & value() const { return value_; }
@@ -72,6 +72,8 @@ namespace xo {
         return tag_impl<true, char const *, char const *>(n, "");
     } /*xtag_pre*/
 
+    // ----- tag -----
+
     template<typename Name, typename Value>
     tag_impl<false, Name, Value>
     tag(Name && n, Value && v)
@@ -86,6 +88,8 @@ namespace xo {
         return tag_impl<false, char const *, Value>(n, v);
     } /*tag*/
 
+    // ----- operator<< on tag_impl -----
+
     template <bool PrefixSpace, typename Name, typename Value>
     inline std::ostream &
     operator<<(std::ostream &s,