Removed a few more instances of std::function from the core library