commit 60ed6d1908f7cb232b9a60b0fa7a9ec667d08010
Author: Daniel Swanson <popcorn.tomato.dude@gmail.com>
Date:   Sat Jun 12 17:10:14 2021 -0500

    tweaks

diff --git a/apertium/mtx_reader.cc b/apertium/mtx_reader.cc
index 70f85de..e8b9cd0 100644
--- a/apertium/mtx_reader.cc
+++ b/apertium/mtx_reader.cc
@@ -41,12 +41,10 @@ size_t MTXReader::pushSetConst(std::string &val)
   size_t set_idx = spec.set_consts.size();
   set<std::string> s;
   std::stringstream val_ss(val);
-  while (!val_ss.eof()) {
-    std::string temp;
-    val_ss >> temp;
-    s.insert(temp);
-  }
-  spec.set_consts.push_back(s);
+  spec.set_consts.push_back(set<std::string>(
+    istream_iterator<std::string>(val_ss),
+    istream_iterator<std::string>()
+  ));
   return set_idx;
 }
 
diff --git a/apertium/perceptron_spec.cc b/apertium/perceptron_spec.cc
index b70560a..70b20c5 100644
--- a/apertium/perceptron_spec.cc
+++ b/apertium/perceptron_spec.cc
@@ -95,7 +95,7 @@ PerceptronSpec::PerceptronSpec() {
     }
 
     untagged_sentinel = make_sentinel_wordoids("!UNTAGGED!"_u, "!UT!"_u);
-    token_wordoids_underflow = make_sentinel_token("!SURFNDERFLOW!"_u, "!TOKNDERFLOW!"_u, "!TUF!"_u);
+    token_wordoids_underflow = make_sentinel_token("!SURF_UNDERFLOW!"_u, "!TOKNDERFLOW!"_u, "!TUF!"_u);
     token_wordoids_overflow = make_sentinel_token("!SURF_OVERFLOW!"_u, "!TOK_OVERFLOW!"_u, "!TOF!"_u);
 
     static_constructed = true;
@@ -483,13 +483,13 @@ PerceptronSpec::Machine::execCommonOp(Opcode op)
       UString surf = get_token(untagged).TheSurfaceForm;
       std::string temp;
       utf8::utf16to8(surf.begin(), surf.end(), std::back_inserter(temp));
-      stack.push(temp);
+      stack.push(std::move(temp));
     } break;
     case EXWRDLEMMA: {
       UString lemma = stack.pop_off().wrd().TheLemma;
       std::string temp;
       utf8::utf16to8(lemma.begin(), lemma.end(), std::back_inserter(temp));
-      stack.push(temp);
+      stack.push(std::move(temp));
     } break;
     case EXWRDCOARSETAG: {
       assert(spec.coarse_tags);