De-tuplify the rest of the core

Commit

6 years ago

De-tuplify the rest of the core Co-authored-by: Dougal Maclaurin <dougalm@google.com>