Re-factored the symbol table and its scoping.