Code clean up after codetools::checkUsage()