remove a bunch of boost::bind() calls we didn't really need