Try again to remove tr1/functional reference