Starting to fix outbound argument values.