Changed argument processing.