r20182: make the composite api usage more consistant (only cosmetic change)