Use new form in all places we give a book image. Do a tiny bit of
bulletproofing.