Another big set of function/bind migration