Upgrade with new version of syntax in SugarCpp.