Tidy up scope for GCC.