Check each piece and fix the obvious screw-ups.
Check each piece and fix the obvious screw-ups.

Most problems were because I was busy changing filenames in mid-stream
and hadn't caught all my changes.

jsh/BarrBookCode,jsh/BarrBookCode,jsh/BarrBookCode