Fixing resolving of symbols without namespaces.
Simplifying code.