Tidying before next release.