Fixed up C11 implementation such that it now compiles on GCC 4.9