Rearrange savior extension code.