bin: Refactor argv/options CLI stuff