Revert "More libcorkscrew fixes for GCC 4.8+"

This reverts commit 1d9ded2dae6dc163fc38239aad853d3d3c5fe221.