Fix option handling w.r.t. latest optparse-applicative release
Progress on adding per-source state