[base] CompositeSource: code readability improvements
[base] CompositeSource: code readability improvements

christianparpart/x0,christianparpart/x0,christianparpart/x0,christianparpart/x0,xzero/x0,christianparpart/x0,xzero/x0,xzero/x0,christianparpart/x0,christianparpart/x0,xzero/x0,xzero/x0,xzero/x0