A bunch more fixes for strict mode.