Small modifications to passarg