Update all non-test callers to use Mixed modulestore.