Removes more indirections in celt.c