Respect local_dict and global_dict when splitting symbols
Merge pull request #2530 from lidavidm/fix_symbol_splitting

Respect local_dict and global_dict when splitting symbols