Some more package and system cleanups.