Merge "Cleanup package_string() and its users"