Simplify.
Merge topic 'target-transitive-sources' into next

b59ac8b3 Simplify.