Changes for multitexture > 3, code clean-ups.