Further optimization

Working through more simplification in draw_terrain.