Reconcile command line options for datasource, refactors related to MRs: sgn-ligo!24 (merged), sgn-ts!52 (merged)