Much of the issues mentioned in the diff are already fixed according to the c...