More work on SAV refactoring.