Fixup for 113c917f
Fixup for 664e0ce7
Add transition from command array parsing back to message state