DiffMerge the final script differences.

FInal changes from the method rebase.