Further progress porting to new meta-model.