Given the number of issues, I suggest leaving it and doing the whole file in a separate PR.