Fixed handling for commands with 3+ arguments.

Per Issue #19.