make_package: Minor cleanup