more cleanup unwind compound function calls.