Move opt_* into same file as main()/run()