Removed dependency on endjin.composition