Update suppressWarning()/restoreWarning() calls