In C code, remove next_uint8 and next_uint16 functions.