diff --git a/apps/zasm/main.asm b/apps/zasm/main.asm
index 9126c5e..ca258dd 100644
--- a/apps/zasm/main.asm
+++ b/apps/zasm/main.asm
@@ -27,6 +27,8 @@ zasmMain:
 	ld	de, .argspecs
 	ld	ix, ZASM_RAMSTART
 	call	parseArgs
+	ld	hl, 0
+	ld	de, 0
 	ld	a, SHELL_ERR_BAD_ARGS
 	ret	nz
 
@@ -35,7 +37,6 @@ zasmMain:
 	ld	a, (ZASM_RAMSTART)	; blkdev in ID
 	ld	de, IO_IN_GETC
 	call	blkSel
-	inc	hl
 	ld	a, (ZASM_RAMSTART+1)	; blkdev out ID
 	ld	de, IO_OUT_GETC
 	call	blkSel
diff --git a/kernel/parse.asm b/kernel/parse.asm
index f4cc5b7..b921379 100644
--- a/kernel/parse.asm
+++ b/kernel/parse.asm
@@ -69,7 +69,6 @@ parseHexPair:
 	pop	bc
 	ret
 
-; TODO: make parseArgs not expect a leading space.
 ; Parse arguments at (HL) with specifiers at (DE) into (IX).
 ;
 ; Args specifiers are a series of flag for each arg:
@@ -94,7 +93,6 @@ parseArgs:
 	push	ix
 
 	ld	b, PARSE_ARG_MAXCOUNT
-	xor	c
 .loop:
 	; init the arg value to a default 0
 	xor	a
@@ -105,22 +103,12 @@ parseArgs:
 	or	a		; cp 0
 	jr	z, .endofargs
 
-	; do we have a proper space char?
-	cp	' '
-	jr	z, .hasspace	; We're fine
-
-	; is our previous arg a multibyte? (argspec still in C)
-	bit	1, c
-	jr	z, .error	; bit not set? error
-	dec	hl		; offset the "inc hl" below
-
-.hasspace:
 	; Get the specs
 	ld	a, (de)
 	bit	0, a		; do we have an arg?
 	jr	z, .error	; not set? then we have too many args
-	ld	c, a		; save the specs for the next loop
-	inc	hl		; (hl) points to a space, go next
+
+	ld	c, a		; save the specs for multibyte check later
 	bit	3, a		; is our arg a string?
 	jr	z, .notAString
 	; our arg is a string. Let's place HL in our next two bytes and call
@@ -128,9 +116,11 @@ parseArgs:
 	ld	(ix), l
 	ld	(ix+1), h
 	jr	.success	; directly to success: skip endofargs checks
+
 .notAString:
 	call	parseHexPair
 	jr	c, .error
+
 	; we have a good arg and we need to write A in (IX).
 	ld	(ix), a
 
@@ -138,10 +128,23 @@ parseArgs:
 	inc	de
 	inc	ix
 	inc	hl		; get to following char (generally a space)
+
+	; Our arg is parsed, our pointers are increased. Normally, HL should
+	; point to a space *unless* our argspec indicates a multibyte arg.
+	bit	1, c
+	jr	nz, .nospacecheck	; bit set? no space check
+	; do we have a proper space char (or null char)?
+	ld	a, (hl)
+	or	a
+	jr	z, .endofargs
+	cp	' '
+	jr	nz, .error
+	inc	hl
+.nospacecheck:
 	djnz	.loop
 	; If we get here, it means that our next char *has* to be a null char
 	ld	a, (hl)
-	cp	0
+	or	a		; cp 0
 	jr	z, .success	; zero? great!
 	jr	.error
 
@@ -149,12 +152,11 @@ parseArgs:
 	; We encountered our null char. Let's verify that we either have no
 	; more args or that they are optional
 	ld	a, (de)
-	cp	0
+	or	a
 	jr	z, .success	; no arg? success
 	bit	2, a
-	jr	nz, .success	; if set, arg is optional. success
-	jr	.error
-
+	jr	z, .error	; if unset, arg is not optional. error
+	; success
 .success:
 	xor	a
 	jr	.end
diff --git a/kernel/shell.asm b/kernel/shell.asm
index 4d76991..4f8d4d5 100644
--- a/kernel/shell.asm
+++ b/kernel/shell.asm
@@ -168,7 +168,11 @@ shellParse:
 	; advance the HL pointer to the beginning of the args.
 	ld	a, ' '
 	call	findchar
+	or	a		; end of string? don't increase HL
+	jr	z, .noargs
+	inc	hl		; char after space
 
+.noargs:
 	; Now, let's have DE point to the argspecs
 	ld	a, 4
 	call	addDE
diff --git a/tools/emul/user.h b/tools/emul/user.h
index 88d8121..14126f6 100644
--- a/tools/emul/user.h
+++ b/tools/emul/user.h
@@ -21,3 +21,4 @@
 .equ    fsSeek         0x30
 .equ    fsTell         0x33
 .equ    cpHLDE         0x36
+.equ    parseArgs      0x39
diff --git a/tools/emul/zasm/glue.asm b/tools/emul/zasm/glue.asm
index f105220..0f92c73 100644
--- a/tools/emul/zasm/glue.asm
+++ b/tools/emul/zasm/glue.asm
@@ -58,7 +58,7 @@ init:
 	halt
 
 .zasmArgs:
-	.db	" 0 1", 0
+	.db	"0 1", 0
 
 ; *** I/O ***
 emulGetC: