Fix tuple unpacking issue added by previous change.