Back out dependency on tuples