Time to make repair work, and also move to bleeding CanaryLib...