I've opened two PR's showing the diffs, neither are ready to merge.