Slight code-reordering to enable the next delta.