Pass filenames as arguments, not via options.

Fixes #1326
remove?