Fixup apt module refactoring from previous patch.