Now all the format/type-related helper functions are in glformats.c and image.c is just image-related functions.