GraphQL: Address STORAGE-TODOs in code

---

Migrated from T4382 (view on Phabricator)