sml: do not copy annotation tags unless defined in model

- rebase dia sml to avoid spurious diffs between om and c++