More work on the metamodel.