diagrams: minor cosmetic tidy-ups
cpp: start design work on merging cpp formatters model