Migrate InstallSnapshot/SnapshotTracker use of Optional