Plumbed in OptionParser; fixes #2