diff --git a/lib/convert-worker.js b/lib/convert-worker.js
index e796a84..531347b 100644
--- a/lib/convert-worker.js
+++ b/lib/convert-worker.js
@@ -197,6 +197,7 @@ function getBodyXML(chapter, book, contentEl) {
   xml = xml.replace(/I”(m|ll)/g, "I’$1");
   xml = xml.replace(/””<\/p>/g, "”</p>");
   xml = xml.replace(/^([^“]+?) ?”(?![ —<])/gm, "$1 “");
+  xml = xml.replace(/(?<!“)<em>([A-Za-z]+),<\/em>(?!”| +[A-Za-z]+ thought)/, "<em>$1</em>,");
 
   // Similar problems occur in Ward with <b> and <strong> as do in Worm with <em>s
   xml = xml.replace(/<b \/>/g, "");
diff --git a/lib/substitutions.json b/lib/substitutions.json
index 3552166..854677e 100644
--- a/lib/substitutions.json
+++ b/lib/substitutions.json
@@ -956,7 +956,7 @@
       "after": "CD-6.</em></p>"
     },
     {
-      "before": "<em>Narwhal,</em>",
+      "before": "<em>Narwhal</em>,",
       "after": "Narwhal,"
     },
     {
@@ -5677,10 +5677,6 @@
       "before": "assistant Warden",
       "after": "assistant warden"
     },
-    {
-      "before": "behind those things was <em>By,</em>",
-      "after": "behind those things was <em>By</em>,"
-    },
     {
       "before": "<em>What got into you</em>?",
       "after": "<em>What got into you?</em>"
@@ -5714,10 +5710,6 @@
     {
       "before": "finds it’s root",
       "after": "finds its root"
-    },
-    {
-      "before": "they’re <em>Valkyrie,</em> Crystal",
-      "after": "they’re <em>Valkyrie</em>, Crystal"
     }
   ],
   "https://www.parahumans.net/2018/10/23/polarize-10-1/": [
@@ -7073,8 +7065,8 @@
       "after": "Your issue with Dad"
     },
     {
-      "before": "My boss is-was <em>Narwhal,</em> mom",
-      "after": "My boss is—was <em>Narwhal</em>, Mom"
+      "before": "My boss is-was",
+      "after": "My boss is—was"
     },
     {
       "before": "he mom shook her head",