Reworking headers so that they rely entirely on KeyValueStore.