Overhaul defs to derive from a common base.
15 files changed