Mostly restructuring/cleaning piecewise linearity proofs