- finalized optimization #1, ...
- made way for #2 (const hash store)