Use the new n-way diff-include consolidation to be much more size-efficient. (I have to make n-way diff-include first...)