Simplify return type of diagonal(Index) (and ease compiler job)

--HG--
branch : 3.2
extra : source : e8aee247f42a406c49b134067d4b803c5b35dd76