Fix broken borrow tracking (issue #5)