Yet more work on recursively declared OMM components.