Refactor OnDemandGenerator to generate OnDemandElements per Encoding rather than assuming that there
is a single Encoding per Item.