Bug fix to recursive lambda + reorganization.