Fix SNL unicode testing.
Fix test in structure analyzer.
CLeanup.