Velvet: fix options for command-line arguments.

Closes #985.