Fix argument parsing for parsing of non-simple types like dictionaries (arguments that may have spaces)