This is a mostly performance-neutral (maybe immeasurably positive) commit in preparation for later structural changes.