Tidy up according to R-spec tests.