Updates to address errors introduced by a new version of roxygen2.