diagrams: start making the CPP model look more like SML