revert: Separate cmdline parsing from functional code