Port changes to IChangeTrackerClient. Misc cleanup.