Updates for R CMD CHECK.