cschwarz-stat-sfu-ca CRAN submission fixes.