Removing boost::bind