This commit, and next one, are specifically to make a future commit
handling partial dereferences of flattening objects easier to see.