Fixes for R CMD check (on r-devel).