Cleaning up for CRAN submission.