Continued refinement to command parsing