More R CMD check fixes.