Remove borrow/borrow_mut, use autoderef