Revert "Remove tuple arguments"

This reverts commit 16a466d18bf00ad4a56363233324ab1e91707935.