More roxygen 4.0.0 fixes.