diff --git a/modcc/procinliner.cpp b/modcc/procinliner.cpp
index 9b3f15269cd6024de26a08fce6e65e3ebece888d..a478e353ae797cd6f651d6f65967e948658735a5 100644
--- a/modcc/procinliner.cpp
+++ b/modcc/procinliner.cpp
@@ -111,7 +111,7 @@ void ProcedureInliner::visit(BinaryExpression* e) {
 void ProcedureInliner::visit(AssignmentExpression* e) {
     // If we're inlining a call, take care of variable renaming
     if (state_ == state::Running) {
-        if (auto lhs = e->lhs()->is_identifier()) {
+        if (e->lhs()->is_identifier()) {
             e->replace_lhs(substitute(e->lhs(), local_arg_map_));
         }
         if (e->rhs()->is_identifier()) {
diff --git a/test/unit/test_segment_tree.cpp b/test/unit/test_segment_tree.cpp
index f70492d73f8c3e565e7a091768ff5790b4fcc5c6..7875db332380ada05ee97916e8c3794f403dcdb3 100644
--- a/test/unit/test_segment_tree.cpp
+++ b/test/unit/test_segment_tree.cpp
@@ -169,12 +169,13 @@ TEST(segment_tree, split) {
         EXPECT_THROW(arb::split_at(t, arb::mnpos), arb::arbor_exception);
         EXPECT_THROW(arb::split_at(t, 1),          arb::arbor_exception);
     }
-    // gnarly tree
-    // (npos) - 0 - 1 - 4
-    //            \
-    //              2 - 3
-    //                \
-    //                  5
+    /* gnarly tree
+    ** (npos) - 0 - 1 - 4
+    **            \
+    **              2 - 3
+    **                \
+    **                  5
+    */
     // NB: Splitting _will_ re-order segments. So we have to be careful when
     //     building values to compare against.
     {
@@ -275,12 +276,13 @@ TEST(segment_tree, join) {
         EXPECT_THROW(arb::split_at(t, arb::mnpos), arb::arbor_exception);
         EXPECT_THROW(arb::split_at(t, 1),          arb::arbor_exception);
     }
-    // gnarly tree
-    // (npos) - 0 - 1 - 4
-    //            \
-    //              2 - 3
-    //                \
-    //                  5
+    /* gnarly tree
+    ** (npos) - 0 - 1 - 4
+    **            \
+    **              2 - 3
+    **                \
+    **                  5
+    */
     // NB: Joining _will_ re-order segments. So we have to be careful when
     //     building values to compare against.
     {