
        Remove old borrow check workarounds and appease the new borrow checker.