more CHILD_SA refactorings