Merge pull request #258 from lowjoel/fix-syntax-whitespace
Fix whitespace handling in all commands

(main@48dbf61a88496e3c31e081bc0137f8d8facaefdc)