Eliminate more closures