Some more AddonManager refactoring