updated to support named fun exprs.