Improve portability across versions of 'gcc'.
Mercurial revision: c6cade6dabe71a9e1f26c9a7d6db67fe9c6e368a