Quickbook: Merge from trunk.

- Add ids to more elements.
- Try to avoid generating duplicate ids.
- Simplify the grammar a little to avoid what I assume are optimization bugs in
  older versions of gcc.


[SVN r73445]

tools/quickbook

@@ -1 +1 @@
-Subproject commit 34d6ee0da06720960121ad24b669f271bd9c4326
+Subproject commit a8862fe8a54a6e6e9d31e2030d6669bb07a07b99