First round of cleanup up the AddonManager a bit