Strict: Don't define functions within conditional.
Strict: There is no global this.
Merge pull request #2176 from waywardmonkeys/strict-fixes-2

Strict fixes 2