[util] Further refactor option parsing
2 files changed