diff --git a/tmac/s.tmac b/tmac/s.tmac
index cf0eca8..0749eba 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1188,6 +1188,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 .nr \\n[.ev]:pri 0
 address@hidden
 ..
+.de address@hidden
+.sp \\n[\\n[.ev]:PD]u
+.ne \\n[PORPHANS]v+\\n(.Vu
+..
 .\" This can be redefined by the user.
 .de TA
 .ta T 5n
@@ -1202,14 +1206,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 .nr \\n[.ev]:pli \\$1
 .nr \\n[.ev]:pri \\$2
 address@hidden
-.sp \\n[\\n[.ev]:PD]u
-.ne \\n[PORPHANS]v+\\n(.Vu
-..
-.de address@hidden
-.nr \\n[.ev]:pli 0
-.nr \\n[.ev]:pri 0
address@hidden
address@hidden
 ..
+.als address@hidden @RT
 .\" normal LP
 .de @LP
 .par*start 0 0
@@ -1298,6 +1297,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\}
 .el address@hidden unbalanced \\$0
 address@hidden
+.if '\\$0'QE' address@hidden
 ..
 .de @QS
 .br
@@ -1311,6 +1311,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 .nr \\n[.ev]:ri +\\n[QI]
 .nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
 address@hidden
address@hidden
 ..
 .als @QE @RE
 .\" start boxed text