Thank you.  I've applied this change, but I'm confused.  You closed your pull request #1, saying "Effectively merged into master," but #2 doesn't include "gauche-test.scm", "srfi-158.htm", or the other changes you made in #1.  Don't you still want to include those changes?