Fix EmbeddedValue when new model syntax is used (fixes #196)