Add --committer option, and break out helper function