Fix whitespace handling in all commands

Fixes #238