Fixes to algebra (and as a side-effect to calculus) to split (flat) expressions from (nested) operators.