Some more content derivation cleanup.