More support for alternative items, and email cart support.