Ported more across to new meta-model.