Work around bugs in old compilers