Some code cleanup and optimization, still more to do on optimization front.  Also EQGv3 zones now generate v2 maps. Huzzah.