Some more refactoring of puavo-install.