Set up for better tree diff optimizations