Further fixes for R CMD CHECK.