dia to sml: fix borked clang build
sml to cpp: use all properties from sml rather than cpp model