Wrap holes in closures as well.

This will help prevent scope leakage and provide a good mechanism for
passing in useful fields to the holes.