Go back to wyc::xvector & wyc::xmatrix