This series tidies up the missing interactions between unextended GL3, ARB_texture_multisample and ARB_internalformat_query. No serious functional changes from V1, just a lot of shuffling things around. -- Chris