Support named addons. Remove merging code.