Adjusted for most of the review comments. Added a test that books are left alone, since they will not be active in the interesting cases. I'm not touching any existing phases, so I'm not sure if I should do anything about phase testing?
Thu, Sep 20
The code looks mostly good. Since this is something which changes existing bookmark behavior, I will let one more pair of eyes to look before getting pushed.
I'm folding this into another patch.