[checkpoint] Eliminate special case.