Minor tweaks. Better evaluation of named args.