It seems that we're not correctly handling removal of pending surfaces. 

This is a particular use case for which someone might terminate/kill a pending surface while we never had a chance to set an output on it.