More library wrangling.