Slightly improved support for !gcc compilers