cleaning up some escaping state; adding maps to lookup symbol indexes instead of doing linear search