Reorganize and fix lambdas font lock.