Cleanup composition creation dependencies
This MR is a part of general composition creation refactoring but includes only small independent changes. Requested by this comment - !136 (comment 795911).
Related MRs: !136 (closed) and !138 (merged)
This MR is a part of general composition creation refactoring but includes only small independent changes. Requested by this comment - !136 (comment 795911).
Related MRs: !136 (closed) and !138 (merged)