Merge "Remove unnecessary std::unary_function base classes"