Extract and rework strict mode scenarios