Extra strict-mode fixes.