Fix potentially significant performance reduction due to unpacking in Composition