Removing remaining strict-mode warnings.