Changed messenger to use boost::function and boost::bind.