Removed some more boost.
Removed some more boost::binds.