Rely far less on Python internals. More derived_quantities stuff.
More simplifying of derived_quantities