Fix rust master regressions.