Fixing and clarifying const_casts, only one left (and it won't go away)
Fixed the bug that caused Unmangle to take a wrong turn. Victory!