Allow single items to choose their encoding option.

Following on from #4024 & #4028