Remove some stuff added for old GCC versions.