I might be in a minority here, but I'd be happy to see Leonard stepping in and keeping Iwata at right back. Partly because I think that Leonard is capable (not at Paik's standard, but capable in that position), partly because Iwata has IMO been a revelation at right back/inside forward/right wing/wherever he goes, and partly because Tommy Doyle is now at the stage where he's running the show creatively, and I think that Leonard could play the 'steady' part.