Limiting the scope of shell state changes