More package wrangling.