sml: move opaque parameters from om into sml
patches: add latest changes for tagging