Refactor reloading of computed values, DRY
Careful with revamping deleted objects (ref #783)