diff --git a/src/lib/format-util.hpp b/src/lib/format-util.hpp
index 80d044666..8e8c95dad 100644
--- a/src/lib/format-util.hpp
+++ b/src/lib/format-util.hpp
@@ -14,7 +14,7 @@
 
 /** @file format-util.hpp
  ** Collection of small helpers and convenience shortcuts for diagnostics & formatting.
- ** - util::str() performs a failsafe to-String conversion, thereby preferring a
+ ** - util::toString() performs a failsafe to-String conversion, thereby preferring a
  **         built-in conversion operator, falling back to just a mangled type string.
  ** - util::join() generates an enumerating string from elements
  **         of an arbitrary sequence or iterable. Elements will be passed
diff --git a/src/lib/text-template.hpp b/src/lib/text-template.hpp
index 7d28ba42b..674989955 100644
--- a/src/lib/text-template.hpp
+++ b/src/lib/text-template.hpp
@@ -542,8 +542,8 @@ namespace lib {
               addCode(COND);
               break;
             case TagSyntax::END_IF:
-              addLead();
               __checkBalanced(IF);
+              addLead();
               if (hasElse())
                 linkJumpToNext();
               else
@@ -557,8 +557,8 @@ namespace lib {
               addCode(ITER);
               break;
             case TagSyntax::END_FOR:
-              addLead();
               __checkBalanced(FOR);
+              addLead();
               if (hasElse())
                 linkJumpToNext();
               else
@@ -570,9 +570,9 @@ namespace lib {
               closeScope();
               break;
             case TagSyntax::ELSE:
-              addLead();
               __checkInScope();
               __checkNoDup();
+              addLead();
               if (IF == scope_.top().clause)
                 {
                   markJumpInScope();
diff --git a/src/steam/control/command-setup.cpp b/src/steam/control/command-setup.cpp
index d9aef6b7e..acb1d4b43 100644
--- a/src/steam/control/command-setup.cpp
+++ b/src/steam/control/command-setup.cpp
@@ -175,13 +175,13 @@ namespace control {
     Symbol instanceID{prototypeID, invocationID};
     Command& instance = table_[instanceID];
     if (instance)
-      throw new error::Logic (_Fmt{"Attempt to create a new Command instance '%s', "
-                                   "while an instance for this invocationID %s "
-                                   "is currently open for parametrisation and "
-                                   "not yet dispatched for execution."}
-                                  % instanceID % invocationID
-                             , LERR_(DUPLICATE_COMMAND)
-                             );
+      throw error::Logic (_Fmt{"Attempt to create a new Command instance '%s', "
+                               "while an instance for this invocationID %s "
+                               "is currently open for parametrisation and "
+                               "not yet dispatched for execution."}
+                              % instanceID % invocationID
+                         , LERR_(DUPLICATE_COMMAND)
+                         );
     // create new clone from the prototype
     table_[instanceID] = move (Command::get(prototypeID).newInstance());
     ENSURE (instance, "cloning of command prototype failed");