Replace various functions calls, for functions which are small wrappers around other functions, to call the wrapped function directly.