Update for recent changes in Cuis submorph clipping (thanks Hari)