Replace crappy ConfigStorage deduplication with decent deduplication.
+ const correctness