Strict mode compatibility

That's what I get for just reading the diff! Fair enough.