Move work from diffing to parsing