This unifies slightly diverged code and ensures that cc_fifo is always initialized.
Signed-off-by: Marton Balint <cus@passwd.hu>