Tightening scope of tenant context.