help the GCC3 transition and CURRENT in general.
where necessary. Submitted by: Mike Barcroft <mike@q9media.com>