fix: lambda and named-lambda expansion