fixup: make sure we don't fetch an addon twice if it has old and new extension points
fixup: make sure we always prefer new extension point (if available)
fixup: oops #2