CLI args: reorganize parsing