Attempt 2 at fixing nested arguments.