Beginnings of lambda removal.