Diag for CuVector, minor cleanup