Argument processing improved.