Fixing c++ wrapper generation, top level functions not being sanitized.