Merge "Remove unused variables from closures"