Friendlier error handling
Support already-renamed green stacks better