one step closer to restoring GCC-3.3 support: kills 12 errors, just 2 to go