Here's the cleaned up diff <https://github.com/zwa...