Take deffamily not rely on runtime transitive closure; various refactorings