Update for new closure-lifetime syntax.