Consider parameters in command bindings. Fixes #1