[riak-cli] - Refactor option router.