Fix poorly applied patch
Turn mutexes into nops on single threaded systems
Work on phase2 unwind
Fix typo
Fix a broken test
Fix demangle test case
Back out phase2 unwind work