Jaap V's changes plus a few of my own -- now it seems to work.
1 file changed