Need to reinclude boost/lambda to make Klaus' test run