This does work, but I thought lambdas were templates as well? Anyway I've commited the changes.