Some cleanup, mainly in Gfx.cc