minor stuff
merge complete
Avoiding recomputation of portrait in find_mod_depths...