* Make composition fully Matrix compliant.