Agreed. I've updated all such code to use ```save_component```, and similarly refactored the earlier code at 111 to use ```edit_component```. I also removed that odd waiting logic at 111 as it seems that it isn't done universally when clicking the edit button. If it turns out it is needed we can move it into ```edit_component```.