Deal with keywords not supported in GCC 4.6

Change-Id: I32293346ba31fa90694f23a37500428658f52d31