Fix clone() of wrapped entities to not create longer wrapped chains.