Conversion to roxygen headers, 2