diff --git a/libcelt/bands.c b/libcelt/bands.c
index 7efa58d5..30967434 100644
--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -79,10 +79,9 @@ const celt_word16_t sqrtC_1[2] = {QCONST16(1.f, 14), QCONST16(1.414214f, 14)};
 /* Compute the amplitude (sqrt energy) in each of the bands */
 void compute_band_energies(const CELTMode *m, const celt_sig_t *X, celt_ener_t *bank)
 {
-   int i, c, B, C;
+   int i, c;
    const celt_int16_t *eBands = m->eBands;
-   B = m->nbMdctBlocks;
-   C = m->nbChannels;
+   const int C = CHANNELS(m);
    for (c=0;c<C;c++)
    {
       for (i=0;i<m->nbEBands;i++)
@@ -90,12 +89,12 @@ void compute_band_energies(const CELTMode *m, const celt_sig_t *X, celt_ener_t *
          int j;
          celt_word32_t maxval=0;
          celt_word32_t sum = 0;
-         for (j=B*eBands[i];j<B*eBands[i+1];j++)
+         for (j=eBands[i];j<eBands[i+1];j++)
             maxval = MAX32(maxval, ABS32(X[j*C+c]));
          if (maxval > 0)
          {
             int shift = celt_ilog2(maxval)-10;
-            for (j=B*eBands[i];j<B*eBands[i+1];j++)
+            for (j=eBands[i];j<eBands[i+1];j++)
                sum += MULT16_16(EXTRACT16(VSHR32(X[j*C+c],shift)),EXTRACT16(VSHR32(X[j*C+c],shift)));
             /* We're adding one here to make damn sure we never end up with a pitch vector that's
                larger than unity norm */
@@ -112,10 +111,9 @@ void compute_band_energies(const CELTMode *m, const celt_sig_t *X, celt_ener_t *
 /* Normalise each band such that the energy is one. */
 void normalise_bands(const CELTMode *m, const celt_sig_t * restrict freq, celt_norm_t * restrict X, const celt_ener_t *bank)
 {
-   int i, c, B, C;
+   int i, c;
    const celt_int16_t *eBands = m->eBands;
-   B = m->nbMdctBlocks;
-   C = m->nbChannels;
+   const int C = CHANNELS(m);
    for (c=0;c<C;c++)
    {
       for (i=0;i<m->nbEBands;i++)
@@ -126,14 +124,15 @@ void normalise_bands(const CELTMode *m, const celt_sig_t * restrict freq, celt_n
          shift = celt_zlog2(bank[i*C+c])-13;
          E = VSHR32(bank[i*C+c], shift);
          g = EXTRACT16(celt_rcp(SHR32(MULT16_16(E,sqrtC_1[C-1]),11)));
-         for (j=B*eBands[i];j<B*eBands[i+1];j++)
+         for (j=eBands[i];j<eBands[i+1];j++)
             X[j*C+c] = MULT16_16_Q14(VSHR32(freq[j*C+c],shift),g);
       }
    }
-   for (i=B*C*eBands[m->nbEBands];i<B*C*eBands[m->nbEBands+1];i++)
+   for (i=C*eBands[m->nbEBands];i<C*eBands[m->nbEBands+1];i++)
       X[i] = 0;
 }
 
+#ifndef DISABLE_STEREO
 void renormalise_bands(const CELTMode *m, celt_norm_t * restrict X)
 {
    int i;
@@ -141,28 +140,28 @@ void renormalise_bands(const CELTMode *m, celt_norm_t * restrict X)
    VARDECL(celt_sig_t, freq);
    SAVE_STACK;
    ALLOC(tmpE, m->nbEBands*m->nbChannels, celt_ener_t);
-   ALLOC(freq, m->nbMdctBlocks*m->nbChannels*m->eBands[m->nbEBands+1], celt_sig_t);
-   for (i=0;i<m->nbMdctBlocks*m->nbChannels*m->eBands[m->nbEBands+1];i++)
+   ALLOC(freq, m->nbChannels*m->eBands[m->nbEBands+1], celt_sig_t);
+   for (i=0;i<m->nbChannels*m->eBands[m->nbEBands+1];i++)
       freq[i] = SHL32(EXTEND32(X[i]), 10);
    compute_band_energies(m, freq, tmpE);
    normalise_bands(m, freq, X, tmpE);
    RESTORE_STACK;
 }
-#else
+#endif /* DISABLE_STEREO */
+#else /* FIXED_POINT */
 /* Compute the amplitude (sqrt energy) in each of the bands */
 void compute_band_energies(const CELTMode *m, const celt_sig_t *X, celt_ener_t *bank)
 {
-   int i, c, B, C;
+   int i, c;
    const celt_int16_t *eBands = m->eBands;
-   B = m->nbMdctBlocks;
-   C = m->nbChannels;
+   const int C = CHANNELS(m);
    for (c=0;c<C;c++)
    {
       for (i=0;i<m->nbEBands;i++)
       {
          int j;
          celt_word32_t sum = 1e-10;
-         for (j=B*eBands[i];j<B*eBands[i+1];j++)
+         for (j=eBands[i];j<eBands[i+1];j++)
             sum += X[j*C+c]*X[j*C+c];
          bank[i*C+c] = sqrt(sum);
          /*printf ("%f ", bank[i*C+c]);*/
@@ -174,24 +173,24 @@ void compute_band_energies(const CELTMode *m, const celt_sig_t *X, celt_ener_t *
 /* Normalise each band such that the energy is one. */
 void normalise_bands(const CELTMode *m, const celt_sig_t * restrict freq, celt_norm_t * restrict X, const celt_ener_t *bank)
 {
-   int i, c, B, C;
+   int i, c;
    const celt_int16_t *eBands = m->eBands;
-   B = m->nbMdctBlocks;
-   C = m->nbChannels;
+   const int C = CHANNELS(m);
    for (c=0;c<C;c++)
    {
       for (i=0;i<m->nbEBands;i++)
       {
          int j;
          celt_word16_t g = 1.f/(1e-10+bank[i*C+c]*sqrt(C));
-         for (j=B*eBands[i];j<B*eBands[i+1];j++)
+         for (j=eBands[i];j<eBands[i+1];j++)
             X[j*C+c] = freq[j*C+c]*g;
       }
    }
-   for (i=B*C*eBands[m->nbEBands];i<B*C*eBands[m->nbEBands+1];i++)
+   for (i=C*eBands[m->nbEBands];i<C*eBands[m->nbEBands+1];i++)
       X[i] = 0;
 }
 
+#ifndef DISABLE_STEREO
 void renormalise_bands(const CELTMode *m, celt_norm_t * restrict X)
 {
    VARDECL(celt_ener_t, tmpE);
@@ -201,15 +200,15 @@ void renormalise_bands(const CELTMode *m, celt_norm_t * restrict X)
    normalise_bands(m, X, X, tmpE);
    RESTORE_STACK;
 }
-#endif
+#endif /* DISABLE_STEREO */
+#endif /* FIXED_POINT */
 
 /* De-normalise the energy to produce the synthesis from the unit-energy bands */
 void denormalise_bands(const CELTMode *m, const celt_norm_t * restrict X, celt_sig_t * restrict freq, const celt_ener_t *bank)
 {
-   int i, c, B, C;
+   int i, c;
    const celt_int16_t *eBands = m->eBands;
-   B = m->nbMdctBlocks;
-   C = m->nbChannels;
+   const int C = CHANNELS(m);
    if (C>2)
       celt_fatal("denormalise_bands() not implemented for >2 channels");
    for (c=0;c<C;c++)
@@ -218,11 +217,11 @@ void denormalise_bands(const CELTMode *m, const celt_norm_t * restrict X, celt_s
       {
          int j;
          celt_word32_t g = MULT16_32_Q14(sqrtC_1[C-1],bank[i*C+c]);
-         for (j=B*eBands[i];j<B*eBands[i+1];j++)
+         for (j=eBands[i];j<eBands[i+1];j++)
             freq[j*C+c] = MULT16_32_Q14(X[j*C+c], g);
       }
    }
-   for (i=B*C*eBands[m->nbEBands];i<B*C*eBands[m->nbEBands+1];i++)
+   for (i=C*eBands[m->nbEBands];i<C*eBands[m->nbEBands+1];i++)
       freq[i] = 0;
 }
 
@@ -230,16 +229,16 @@ void denormalise_bands(const CELTMode *m, const celt_norm_t * restrict X, celt_s
 /* Compute the best gain for each "pitch band" */
 void compute_pitch_gain(const CELTMode *m, const celt_norm_t *X, const celt_norm_t *P, celt_pgain_t *gains)
 {
-   int i, B;
+   int i;
    const celt_int16_t *pBands = m->pBands;
-   B = m->nbMdctBlocks*m->nbChannels;
-   
+   const int C = CHANNELS(m);
+
    for (i=0;i<m->nbPBands;i++)
    {
       celt_word32_t Sxy=0, Sxx=0;
       int j;
       /* We know we're not going to overflow because Sxx can't be more than 1 (Q28) */
-      for (j=B*pBands[i];j<B*pBands[i+1];j++)
+      for (j=C*pBands[i];j<C*pBands[i+1];j++)
       {
          Sxy = MAC16_16(Sxy, X[j], P[j]);
          Sxx = MAC16_16(Sxx, X[j], X[j]);
@@ -268,17 +267,17 @@ void compute_pitch_gain(const CELTMode *m, const celt_norm_t *X, const celt_norm
 /* Apply the (quantised) gain to each "pitch band" */
 void pitch_quant_bands(const CELTMode *m, celt_norm_t * restrict P, const celt_pgain_t * restrict gains)
 {
-   int i, B;
+   int i;
    const celt_int16_t *pBands = m->pBands;
-   B = m->nbMdctBlocks*m->nbChannels;
+   const int C = CHANNELS(m);
    for (i=0;i<m->nbPBands;i++)
    {
       int j;
-      for (j=B*pBands[i];j<B*pBands[i+1];j++)
+      for (j=C*pBands[i];j<C*pBands[i+1];j++)
          P[j] = MULT16_16_Q15(gains[i], P[j]);
       /*printf ("%f ", gain);*/
    }
-   for (i=B*pBands[m->nbPBands];i<B*pBands[m->nbPBands+1];i++)
+   for (i=C*pBands[m->nbPBands];i<C*pBands[m->nbPBands+1];i++)
       P[i] = 0;
 }
 
@@ -286,17 +285,16 @@ void pitch_quant_bands(const CELTMode *m, celt_norm_t * restrict P, const celt_p
 /* Quantisation of the residual */
 void quant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, celt_mask_t *W, int total_bits, ec_enc *enc)
 {
-   int i, j, B, bits;
+   int i, j, bits;
    const celt_int16_t *eBands = m->eBands;
    celt_norm_t * restrict norm;
    VARDECL(celt_norm_t, _norm);
    VARDECL(int, pulses);
    VARDECL(int, offsets);
+   const int C = CHANNELS(m);
    SAVE_STACK;
 
-   B = m->nbMdctBlocks*m->nbChannels;
-   
-   ALLOC(_norm, B*eBands[m->nbEBands+1], celt_norm_t);
+   ALLOC(_norm, C*eBands[m->nbEBands+1], celt_norm_t);
    ALLOC(pulses, m->nbEBands, int);
    ALLOC(offsets, m->nbEBands, int);
    norm = _norm;
@@ -317,34 +315,34 @@ void quant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, ce
       int q;
       celt_word16_t n;
       q = pulses[i];
-      n = SHL16(celt_sqrt(B*(eBands[i+1]-eBands[i])),11);
+      n = SHL16(celt_sqrt(C*(eBands[i+1]-eBands[i])),11);
 
       /* If pitch isn't available, use intra-frame prediction */
       if (eBands[i] >= m->pitchEnd || q<=0)
       {
          q -= 1;
          if (q<0)
-            intra_fold(X+B*eBands[i], eBands[i+1]-eBands[i], norm, P+B*eBands[i], B, eBands[i], eBands[m->nbEBands+1]);
+            intra_fold(X+C*eBands[i], eBands[i+1]-eBands[i], norm, P+C*eBands[i], C, eBands[i], eBands[m->nbEBands+1]);
          else
-            intra_prediction(X+B*eBands[i], W+B*eBands[i], eBands[i+1]-eBands[i], q, norm, P+B*eBands[i], B, eBands[i], enc);
+            intra_prediction(X+C*eBands[i], W+C*eBands[i], eBands[i+1]-eBands[i], q, norm, P+C*eBands[i], C, eBands[i], enc);
       }
       
       if (q > 0)
       {
-         int nb_rotations = q <= 2*B ? 2*B/q : 0;
+         int nb_rotations = q <= 2*C ? 2*C/q : 0;
          if (nb_rotations != 0)
          {
-            exp_rotation(P+B*eBands[i], B*(eBands[i+1]-eBands[i]), -1, B, nb_rotations);
-            exp_rotation(X+B*eBands[i], B*(eBands[i+1]-eBands[i]), -1, B, nb_rotations);
+            exp_rotation(P+C*eBands[i], C*(eBands[i+1]-eBands[i]), -1, C, nb_rotations);
+            exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), -1, C, nb_rotations);
          }
-         alg_quant(X+B*eBands[i], W+B*eBands[i], B*(eBands[i+1]-eBands[i]), q, P+B*eBands[i], enc);
+         alg_quant(X+C*eBands[i], W+C*eBands[i], C*(eBands[i+1]-eBands[i]), q, P+C*eBands[i], enc);
          if (nb_rotations != 0)
-            exp_rotation(X+B*eBands[i], B*(eBands[i+1]-eBands[i]), 1, B, nb_rotations);
+            exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), 1, C, nb_rotations);
       }
-      for (j=B*eBands[i];j<B*eBands[i+1];j++)
+      for (j=C*eBands[i];j<C*eBands[i+1];j++)
          norm[j] = MULT16_16_Q15(n,X[j]);
    }
-   for (i=B*eBands[m->nbEBands];i<B*eBands[m->nbEBands+1];i++)
+   for (i=C*eBands[m->nbEBands];i<C*eBands[m->nbEBands+1];i++)
       X[i] = 0;
    RESTORE_STACK;
 }
@@ -352,17 +350,16 @@ void quant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, ce
 /* Decoding of the residual */
 void unquant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, int total_bits, ec_dec *dec)
 {
-   int i, j, B, bits;
+   int i, j, bits;
    const celt_int16_t *eBands = m->eBands;
    celt_norm_t * restrict norm;
    VARDECL(celt_norm_t, _norm);
    VARDECL(int, pulses);
    VARDECL(int, offsets);
+   const int C = CHANNELS(m);
    SAVE_STACK;
 
-   B = m->nbMdctBlocks*m->nbChannels;
-   
-   ALLOC(_norm, B*eBands[m->nbEBands+1], celt_norm_t);
+   ALLOC(_norm, C*eBands[m->nbEBands+1], celt_norm_t);
    ALLOC(pulses, m->nbEBands, int);
    ALLOC(offsets, m->nbEBands, int);
    norm = _norm;
@@ -378,41 +375,41 @@ void unquant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P,
       int q;
       celt_word16_t n;
       q = pulses[i];
-      n = SHL16(celt_sqrt(B*(eBands[i+1]-eBands[i])),11);
+      n = SHL16(celt_sqrt(C*(eBands[i+1]-eBands[i])),11);
 
       /* If pitch isn't available, use intra-frame prediction */
       if (eBands[i] >= m->pitchEnd || q<=0)
       {
          q -= 1;
          if (q<0)
-            intra_fold(X+B*eBands[i], eBands[i+1]-eBands[i], norm, P+B*eBands[i], B, eBands[i], eBands[m->nbEBands+1]);
+            intra_fold(X+C*eBands[i], eBands[i+1]-eBands[i], norm, P+C*eBands[i], C, eBands[i], eBands[m->nbEBands+1]);
          else
-            intra_unquant(X+B*eBands[i], eBands[i+1]-eBands[i], q, norm, P+B*eBands[i], B, eBands[i], dec);
+            intra_unquant(X+C*eBands[i], eBands[i+1]-eBands[i], q, norm, P+C*eBands[i], C, eBands[i], dec);
       }
       
       if (q > 0)
       {
-         int nb_rotations = q <= 2*B ? 2*B/q : 0;
+         int nb_rotations = q <= 2*C ? 2*C/q : 0;
          if (nb_rotations != 0)
-            exp_rotation(P+B*eBands[i], B*(eBands[i+1]-eBands[i]), -1, B, nb_rotations);
-         alg_unquant(X+B*eBands[i], B*(eBands[i+1]-eBands[i]), q, P+B*eBands[i], dec);
+            exp_rotation(P+C*eBands[i], C*(eBands[i+1]-eBands[i]), -1, C, nb_rotations);
+         alg_unquant(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), q, P+C*eBands[i], dec);
          if (nb_rotations != 0)
-            exp_rotation(X+B*eBands[i], B*(eBands[i+1]-eBands[i]), 1, B, nb_rotations);
+            exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), 1, C, nb_rotations);
       }
-      for (j=B*eBands[i];j<B*eBands[i+1];j++)
+      for (j=C*eBands[i];j<C*eBands[i+1];j++)
          norm[j] = MULT16_16_Q15(n,X[j]);
    }
-   for (i=B*eBands[m->nbEBands];i<B*eBands[m->nbEBands+1];i++)
+   for (i=C*eBands[m->nbEBands];i<C*eBands[m->nbEBands+1];i++)
       X[i] = 0;
    RESTORE_STACK;
 }
 
+#ifndef DISABLE_STEREO
 void stereo_mix(const CELTMode *m, celt_norm_t *X, const celt_ener_t *bank, int dir)
 {
-   int i, B, C;
+   int i;
    const celt_int16_t *eBands = m->eBands;
-   B = m->nbMdctBlocks;
-   C = m->nbChannels;
+   const int C = CHANNELS(m);
    for (i=0;i<m->nbEBands;i++)
    {
       int j;
@@ -427,7 +424,7 @@ void stereo_mix(const CELTMode *m, celt_norm_t *X, const celt_ener_t *bank, int
       norm = EPSILON + celt_sqrt(EPSILON+MULT16_16(left,left)+MULT16_16(right,right));
       a1 = DIV32_16(SHL32(EXTEND32(left),14),norm);
       a2 = dir*DIV32_16(SHL32(EXTEND32(right),14),norm);
-      for (j=B*eBands[i];j<B*eBands[i+1];j++)
+      for (j=eBands[i];j<eBands[i+1];j++)
       {
          celt_norm_t r, l;
          l = X[j*C];
@@ -436,7 +433,7 @@ void stereo_mix(const CELTMode *m, celt_norm_t *X, const celt_ener_t *bank, int
          X[j*C+1] = MULT16_16_Q14(a1,r) - MULT16_16_Q14(a2,l);
       }
    }
-   for (i=B*C*eBands[m->nbEBands];i<B*C*eBands[m->nbEBands+1];i++)
+   for (i=C*eBands[m->nbEBands];i<C*eBands[m->nbEBands+1];i++)
       X[i] = 0;
-
 }
+#endif
\ No newline at end of file
diff --git a/libcelt/celt.c b/libcelt/celt.c
index e6025296..269b20e2 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -153,11 +153,13 @@ static inline celt_int16_t SIG2INT16(celt_sig_t x)
 }
 
 /** Apply window and compute the MDCT for all sub-frames and all channels in a frame */
-static void compute_mdcts(const mdct_lookup *lookup, const celt_word16_t * restrict window, celt_sig_t * restrict in, celt_sig_t * restrict out, int N, int overlap, int C)
+static void compute_mdcts(const CELTMode *mode, const celt_word16_t * restrict window, celt_sig_t * restrict in, celt_sig_t * restrict out, int N, int overlap)
 {
    int c, N4;
    VARDECL(celt_word32_t, x);
    VARDECL(celt_word32_t, tmp);
+   const int C = CHANNELS(mode);
+   const mdct_lookup *lookup = MDCT(mode);
    SAVE_STACK;
    N4 = (N-overlap)>>1;
    ALLOC(x, 2*N, celt_word32_t);
@@ -191,11 +193,13 @@ static void compute_mdcts(const mdct_lookup *lookup, const celt_word16_t * restr
 }
 
 /** Compute the IMDCT and apply window for all sub-frames and all channels in a frame */
-static void compute_inv_mdcts(const mdct_lookup *lookup, const celt_word16_t * restrict window, celt_sig_t *X, celt_sig_t * restrict out_mem, celt_sig_t * restrict mdct_overlap, int N, int overlap, int C)
+static void compute_inv_mdcts(const CELTMode *mode, const celt_word16_t * restrict window, celt_sig_t *X, celt_sig_t * restrict out_mem, celt_sig_t * restrict mdct_overlap, int N, int overlap)
 {
    int c, N4;
    VARDECL(celt_word32_t, x);
    VARDECL(celt_word32_t, tmp);
+   const int C = CHANNELS(mode);
+   const mdct_lookup *lookup = MDCT(mode);
    SAVE_STACK;
    ALLOC(x, 2*N, celt_word32_t);
    ALLOC(tmp, N, celt_word32_t);
@@ -221,7 +225,7 @@ static void compute_inv_mdcts(const mdct_lookup *lookup, const celt_word16_t * r
 
 int EXPORT celt_encode(CELTEncoder *st, celt_int16_t *pcm, unsigned char *compressed, int nbCompressedBytes)
 {
-   int i, c, N, C, N4;
+   int i, c, N, N4;
    int has_pitch;
    int pitch_index;
    celt_word32_t curr_power, pitch_power;
@@ -231,13 +235,13 @@ int EXPORT celt_encode(CELTEncoder *st, celt_int16_t *pcm, unsigned char *compre
    VARDECL(celt_norm_t, P);
    VARDECL(celt_ener_t, bandE);
    VARDECL(celt_pgain_t, gains);
+   const int C = CHANNELS(st->mode);
    SAVE_STACK;
 
    if (check_mode(st->mode) != CELT_OK)
       return CELT_INVALID_MODE;
 
    N = st->block_size;
-   C = st->mode->nbChannels;
    N4 = (N-st->overlap)>>1;
    ALLOC(in, 2*C*N-2*N4, celt_sig_t);
    
@@ -262,7 +266,7 @@ int EXPORT celt_encode(CELTEncoder *st, celt_int16_t *pcm, unsigned char *compre
    
    /*for (i=0;i<(B+1)*C*N;i++) printf ("%f(%d) ", in[i], i); printf ("\n");*/
    /* Compute MDCTs */
-   compute_mdcts(&st->mode->mdct, st->mode->window, in, freq, N, st->overlap, C);
+   compute_mdcts(st->mode, st->mode->window, in, freq, N, st->overlap);
 
 #if 0 /* Mask disabled until it can be made to do something useful */
    compute_mdct_masking(X, mask, B*C*N, st->Fs);
@@ -295,7 +299,7 @@ int EXPORT celt_encode(CELTEncoder *st, celt_int16_t *pcm, unsigned char *compre
    /*for (i=0;i<N*B*C;i++)printf("%f ", X[i]);printf("\n");*/
 
    /* Compute MDCTs of the pitch part */
-   compute_mdcts(&st->mode->mdct, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap, C);
+   compute_mdcts(st->mode, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap);
    
 
    quant_energy(st->mode, bandE, st->oldBandE, nbCompressedBytes*8/3, &st->enc);
@@ -359,7 +363,7 @@ int EXPORT celt_encode(CELTEncoder *st, celt_int16_t *pcm, unsigned char *compre
 
    CELT_MOVE(st->out_mem, st->out_mem+C*N, C*(MAX_PERIOD-N));
 
-   compute_inv_mdcts(&st->mode->mdct, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, C);
+   compute_inv_mdcts(st->mode, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap);
    /* De-emphasis and put everything back at the right place in the synthesis history */
    for (c=0;c<C;c++)
    {
@@ -449,7 +453,7 @@ CELTDecoder EXPORT *celt_decoder_create(const CELTMode *mode)
       return NULL;
 
    N = mode->mdctSize;
-   C = mode->nbChannels;
+   C = CHANNELS(mode);
    st = celt_alloc(sizeof(CELTDecoder));
    
    st->mode = mode;
@@ -493,22 +497,22 @@ void EXPORT celt_decoder_destroy(CELTDecoder *st)
     pitch period */
 static void celt_decode_lost(CELTDecoder *st, short *pcm)
 {
-   int c, N, C;
+   int c, N;
    int pitch_index;
    VARDECL(celt_sig_t, freq);
+   const int C = CHANNELS(st->mode);
    SAVE_STACK;
    N = st->block_size;
-   C = st->mode->nbChannels;
    ALLOC(freq,C*N, celt_sig_t);         /**< Interleaved signal MDCTs */
    
    pitch_index = st->last_pitch_index;
    
    /* Use the pitch MDCT as the "guessed" signal */
-   compute_mdcts(&st->mode->mdct, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap, C);
+   compute_mdcts(st->mode, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap);
 
    CELT_MOVE(st->out_mem, st->out_mem+C*N, C*(MAX_PERIOD-N));
    /* Compute inverse MDCTs */
-   compute_inv_mdcts(&st->mode->mdct, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, C);
+   compute_inv_mdcts(st->mode, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap);
 
    for (c=0;c<C;c++)
    {
@@ -526,7 +530,7 @@ static void celt_decode_lost(CELTDecoder *st, short *pcm)
 
 int EXPORT celt_decode(CELTDecoder *st, unsigned char *data, int len, celt_int16_t *pcm)
 {
-   int c, N, C, N4;
+   int c, N, N4;
    int has_pitch;
    int pitch_index;
    ec_dec dec;
@@ -536,13 +540,13 @@ int EXPORT celt_decode(CELTDecoder *st, unsigned char *data, int len, celt_int16
    VARDECL(celt_norm_t, P);
    VARDECL(celt_ener_t, bandE);
    VARDECL(celt_pgain_t, gains);
+   const int C = CHANNELS(st->mode);
    SAVE_STACK;
 
    if (check_mode(st->mode) != CELT_OK)
       return CELT_INVALID_MODE;
 
    N = st->block_size;
-   C = st->mode->nbChannels;
    N4 = (N-st->overlap)>>1;
 
    ALLOC(freq, C*N, celt_sig_t); /**< Interleaved signal MDCTs */
@@ -583,7 +587,7 @@ int EXPORT celt_decode(CELTDecoder *st, unsigned char *data, int len, celt_int16
    }
    
    /* Pitch MDCT */
-   compute_mdcts(&st->mode->mdct, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap, C);
+   compute_mdcts(st->mode, st->mode->window, st->out_mem+pitch_index*C, freq, N, st->overlap);
 
    {
       VARDECL(celt_ener_t, bandEp);
@@ -612,7 +616,7 @@ int EXPORT celt_decode(CELTDecoder *st, unsigned char *data, int len, celt_int16
 
    CELT_MOVE(st->out_mem, st->out_mem+C*N, C*(MAX_PERIOD-N));
    /* Compute inverse MDCTs */
-   compute_inv_mdcts(&st->mode->mdct, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap, C);
+   compute_inv_mdcts(st->mode, st->mode->window, freq, st->out_mem, st->mdct_overlap, N, st->overlap);
 
    for (c=0;c<C;c++)
    {
diff --git a/libcelt/modes.h b/libcelt/modes.h
index 90421ec5..7ca8e3c6 100644
--- a/libcelt/modes.h
+++ b/libcelt/modes.h
@@ -40,6 +40,17 @@
 
 #define MAX_PERIOD 1024
 
+#ifdef DISABLE_STEREO
+#define CHANNELS(mode) (1)
+#else
+#define CHANNELS(mode) ((mode)->nbChannels)
+#endif
+
+#define MDCT(mode) (&(mode)->mdct)
+#define OVERLAP(mode) ((mode)->overlap)
+#define FRAMESIZE(mode) ((mode)->mdctSize)
+
+
 /** Mode definition (opaque)
  @brief Mode definition 
  */