Issue 1178: Depend upon abstractions instead of concrete implementations
for instancing Edm* types