DataMatrix has its own GF modulus. Also minor cleanup