Fix a GCC error from r223803