Adding of missing returns in closures is done. ReturnAdder copied over.