Reenabling Abstract[Block]DistMatrix::ConstructDiagonal by avoiding attempts to use non-static member variables as compile-time constants.