Optimize the make-package tool.