Not related to your change, but wow this is horrible. I didn't know we did this :-(

I'm guessing it predates lambdas and can't be removed now, but it makes me sad.