Move opt.args ahead of non-args, closes #21