I would agree he had a firm hand in the current versions of the tunes, and a good few others like Caoinneadh an Spailpín. I would look at those sooner as re-workings rather than compositions. Recordings of Port na bPucai by Seán Cheaist Ó Catháin and Muíris Ó Dálaigh for example show the tune in it's earlier pre-Riada form.