This fixes a few of the problems Hiroshi Inoue complained of, but
I have not touched the rewrite-related issues.