We should be able to get rid of the superfluous anonymous function here as well.