buggers.
Maybe you can degrade to an older version of the package which doesn't have the noquote stuff. Execute the following in /packages/bookshelf folder of your checkout:
cvs update -r before-noquote
I made a quick check and there shouldn't be any updates you'd be missing other than noquoting. Note that when you update your sources after that, you'll always be receiving the same 'before-noquote' version of bookshelf. If you at some point want to get the latest updates (with noquoting), you have to say "-A" after cvs update.