Change back the name of _d_nz and o_nz
Change DIAGONAL to diagonal in the comments of PETScMatrixOption