am c4dbc16e: Merge "Make cpp.py less braindead."

* commit 'c4dbc16eb03bcc0a3ea04cd32ce7551ad94b2bfc':
  Make cpp.py less braindead.