[WIP] Item access refactor

See #9517