Minor syntax changes to appease the R CMD check goddess.