b835d9abd6
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c' * commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c': Unify some duplicate StrictMode-enabling code.