Mixing in Randall's work. Fixing up binops.