Make a couple more uses of ARRAY_LEN, and convert some spaces to tabs