cpp: minor clean ups to the workflow class
diagrams: more tidy-ups to the C++ model