Update after rewrites to 3-5.