Wrap potential unsafe function call individually (remove prev. wrapper)