Fixups for the current state of lambda.