Convert lambda expressions. Fix DEFPACKAGE.