sml to cpp: Update transformer to use leaves from relationships
sml to cpp: revert extractor changes to fix codegen