Code changes:
 - Make C++ code forward compatible with an upcoming RE2 change.