Convert a few more function pointer calls to just "f()".