Added quotes and heuristics for picking default arguments.