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