Slighlty changed command arguments parser/adapter internal logic

Made parser to preserve the order of options, so I can use it later to provide
some enhancments for the adapter.