Tweaks to config argument processing