Actually, just merge r233362 and do away with the unnecessary uint8_t
pointer casting altogether.