Handles closures correctly again. Closes #700