Convert more of the code to use 16-bit GF heavy submatrix