Tidying things up for package install.