Fixups for upcoming R version. Removes NOTEs in R-devel.