More roxygen2 clean-up.