Update Rebox2 for C++ comments.