Deal with snapshot differences between R CMD check "regular" and "hard" more elegantly

Deal with snapshot differences between R CMD check "regular" and "hard" more elegantly #648