Updated for new closure syntax in latest rust.