Some additional strict-mode fixes.