change inline complex types to explicit complex types

EMF likes them better