GCC 4.8+ fixes for libcorkscrew