Fixing up interleaving of codewords