(Glide2GL) Start getting rid of some combiner macros