Storage is client specific (e.g. VS settings storage, registry) while an option definition that identifies the option itself is usable across layers. Separation these two concepts would improve layering.

Tracks TODO in code.