fix GH#79 (cart and cart resultset mixup)

This looks better. Also removed some cruft.