Convert to native inheritance (remove dejavu dependecy).
Tweaks to previous work, making it all work (hopefully).
CS.