I now rely on a scanner, which reproduces the passages I want to cite, and then I keep my own comments on those books in a separate file so that I will never confuse the two again.