Fixes for Brian's new command-line tools.

Documented in SEQWARE-1691