Change key macro to be nicer for GCC