Finished first-pass on derived value support

Equations which reference a derived value now should operate as
expected.