diff --git a/parser.leg b/parser.leg
index 59595e4..96d0b8e 100644
--- a/parser.leg
+++ b/parser.leg
@@ -529,27 +529,19 @@ UlOrStarLine =  (UlLine | StarLine) { $$ = p.mkString(yytext) }
 StarLine =      < "****" '*'* > | < Spacechar '*'+ &Spacechar >
 UlLine   =      < "____" '_'* > | < Spacechar '_'+ &Spacechar >
 
-SpaceInline = a:StartList
-              ( (b:Space | b:Endline) { a = cons(b, a) } )+
-              c:Inline { a = cons(c, a); $$ = p.mkList(LIST, a) }
-
-NonspaceInline = !Spacechar !Newline Inline
-
 Emph =      EmphStar | EmphUl
 
-EmphStar =  '*'
+EmphStar =  '*' &Nonspacechar
             a:StartList
-            ( !'*' b:NonspaceInline { a = cons(b, a) }
-            | b:SpaceInline { a = cons(b, a) }
+            ( !'*' b:Inline { a = cons(b, a) }
             | b:StrongStar  { a = cons(b, a) }
             )+
             '*'
             { $$ = p.mkList(EMPH, a) }
 
-EmphUl =    '_'
+EmphUl =    '_' &Nonspacechar
             a:StartList
-            ( !'_' b:NonspaceInline { a = cons(b, a) }
-            | b:SpaceInline { a = cons(b, a) }
+            ( !'_' b:Inline { a = cons(b, a) }
             | b:StrongUl  { a = cons(b, a) }
             )+
             '_'
@@ -557,19 +549,15 @@ EmphUl =    '_'
 
 Strong = StrongStar | StrongUl
 
-StrongStar =    "**"
+StrongStar =    "**" &Nonspacechar
                 a:StartList
-                ( !"**" b:NonspaceInline { a = cons(b, a) }
-                | b:SpaceInline { a = cons(b, a) }
-                )+
+                ( !"**" b:Inline { a = cons(b, a) })+
                 "**"
                 { $$ = p.mkList(STRONG, a) }
 
-StrongUl   =    "__"
+StrongUl   =    "__" &Nonspacechar
                 a:StartList
-                ( !"__" b:NonspaceInline { a = cons(b, a) }
-                | b:SpaceInline { a = cons(b, a) }
-                )+
+                ( !"__" b:Inline { a = cons(b, a) })+
                 "__"
                 { $$ = p.mkList(STRONG, a) }
 
diff --git a/portid b/portid
index 6bb2f98..0f11735 100644
--- a/portid
+++ b/portid
@@ -1 +1 @@
-195
+196