Refactored handle_call({repair...}) for readability.