Ported recent Steve's Carts work from 1.5.