MT#7347 fix broken build (scope issues with GCC).