Specifically I think we should compute cdefsources oureslves, rather than poke at private attributes.