In passing small refactoring, we don't need format-package anymore.