Fix fallout of OIBT, UC and by-value binops