I can fix the whole file, in a separate commit or PR, if that helps. Let me know.