diff --git a/src/vmsrc/a1cmd.pla b/src/vmsrc/a1cmd.pla
index e4afb0f..ebd2240 100644
--- a/src/vmsrc/a1cmd.pla
+++ b/src/vmsrc/a1cmd.pla
@@ -448,12 +448,11 @@ asm modtosym
 	INX
 	LDY	#$00
 	LDA	#'#'+$80
-	STA	(DST),Y
--	LDA	(SRC),Y
+-	STA	(DST),Y
+	CMP	#$80
+	LDA	(SRC),Y
 	INY
-	STA	(DST),Y
-	AND	#$80
-	BMI	-
+	BCS	-
 	RTS
 end
 ;
@@ -491,8 +490,8 @@ asm lookuptbl
 	CMP	(SRC),Y
 	BNE	++
 	INY
-	AND	#$80
-	BMI	-
+	CMP	#$80
+	BCS	-
 	LDA	(DST),Y
 	PHA
 	INY
@@ -508,16 +507,14 @@ asm lookuptbl
 	INC	DSTL
 	BNE	++
 	INC	DSTH
-++	AND	#$80
-	BMI	--
+++	CMP	#$80
+	BCS	--
 	LDA	#$02
-	CLC
 	ADC	DSTL
 	STA	DSTL
-	TYA
-	ADC	DSTH
-	STA	DSTH
-	BNE	-
+	BCC	-
+	INC	DSTH
+	BCS	-
 end
 ;
 ; CONSOLE I/O
diff --git a/src/vmsrc/cmd.pla b/src/vmsrc/cmd.pla
index 8722bbb..fbc43b2 100644
--- a/src/vmsrc/cmd.pla
+++ b/src/vmsrc/cmd.pla
@@ -602,12 +602,11 @@ asm modtosym
 	INX
 	LDY	#$00
 	LDA	#'#'+$80
-	STA	(DST),Y
--	LDA	(SRC),Y
+-	STA	(DST),Y
+	CMP	#$80
+	LDA	(SRC),Y
 	INY
-	STA	(DST),Y
-	AND	#$80
-	BMI	-
+	BCS	-
 	RTS
 end
 ;
@@ -645,8 +644,8 @@ asm lookuptbl
 	CMP	(SRC),Y
 	BNE	++
 	INY
-	AND	#$80
-	BMI	-
+	CMP	#$80
+	BCS	-
 	LDA	(DST),Y
 	PHA
 	INY
@@ -662,16 +661,14 @@ asm lookuptbl
 	INC	DSTL
 	BNE	++
 	INC	DSTH
-++	AND	#$80
-	BMI	--
+++	CMP	#$80
+	BCS	--
 	LDA	#$02
-	CLC
 	ADC	DSTL
 	STA	DSTL
-	TYA
-	ADC	DSTH
-	STA	DSTH
-	BNE	-
+	BCC	-
+	INC	DSTH
+	BCS	-
 end
 ;
 ; ProDOS routines
diff --git a/src/vmsrc/soscmd.pla b/src/vmsrc/soscmd.pla
index a59fa9a..1e3de2c 100644
--- a/src/vmsrc/soscmd.pla
+++ b/src/vmsrc/soscmd.pla
@@ -513,12 +513,11 @@ asm modtosym
 	INX
 	LDY	#$00
 	LDA	#'#'+$80
-	STA	(DST),Y
--	LDA	(SRC),Y
+-	STA	(DST),Y
+	CMP	#$80
+	LDA	(SRC),Y
 	INY
-	STA	(DST),Y
-	AND	#$80
-	BMI	-
+	BCS	-
 	RTS
 end
 ;
@@ -561,8 +560,8 @@ asm lookuptbl
 	CMP	(SRC),Y
 	BNE	++
 	INY
-	AND	#$80
-	BMI	-
+	CMP	#$80
+	BCS	-
 	LDA	(DST),Y
 	PHA
 	INY
@@ -580,16 +579,14 @@ asm lookuptbl
 	INC	DSTL
 	BNE	+
 	INC	DSTH
-+	AND	#$80
-	BMI	--
++	CMP	#$80
+	BCS	--
 	LDA	#$02
-	CLC
 	ADC	DSTL
 	STA	DSTL
-	TYA
-	ADC	DSTH
-	STA	DSTH
-	BNE	-
+	BCC	-
+	INC	DSTH
+	BCS	-
 end
 ;
 ; SOS routines