Composite Addon: Major cleanup. Closes #425.