Re-order framing stage
Re-order framing stage

Framing now occurs after intermediate variable insertion, which kills
most of the unneeded intermediate variables from the equations.

septract/starling-tool,septract/starling-tool