Make processing of command arguments more suitable