Removed some unnecessary RefCells from resolve

There is more that could be done, but this was the low hanging fruit.