Untested attempt to fix include-book to accept add-include-book-dir.
Small bug fixes.