Minor changes to comptype defs; using DerivedParameter in place of DerivedVariable in distal/proximal