Primarily work on wsVal() and related items, but update of roxygen2 made some changes as well.