ruff

b307afc0 - Move some accesses behind a shared function