Bug 868427: Fix tidy for v1 carts