Merge "Make cpp.py less braindead."